averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SwiftDemangle] NFC: Increase portability via C standard APIs

Browse Source
This commit is contained in:
David Zarzycki
2017-11-25 14:51:28 -05:00
parent 2018cca048
commit b61a34fe2b
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SwiftDemangle/SwiftDemangle.cpp
View File

@@ -17,9 +17,6 @@
#include "swift/Demangling/Demangle.h"
#include "swift/SwiftDemangle/SwiftDemangle.h"
#if defined(__linux__) || defined(_WIN32)
#include <bsd/string.h>
#endif
static size_t swift_demangle_getDemangledName_Options(const char *MangledName,
char *OutputBuffer, size_t Length,
@@ -36,8 +33,12 @@ static size_t swift_demangle_getDemangledName_Options(const char *MangledName,
if (Result == MangledName)
return 0; // Not a mangled name
// Copy the result to an output buffer.
return strlcpy(OutputBuffer, Result.c_str(), Length);
// Copy the result to an output buffer and ensure '\0' termination.
if (OutputBuffer && Length > 0) {
auto Dest = strncpy(OutputBuffer, Result.c_str(), Length);
Dest[Length - 1] = '\0';
}
return Result.length();
}
size_t swift_demangle_getDemangledName(const char *MangledName,