gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force __cxa_demangle to null terminate its output.

Browse Source
This commit is contained in:
Frederich Munch 2017-02-02 15:54:54 -05:00 committed by sftnight
parent c86fa34e94
commit d00a335350
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Utils/PlatformPosix.cpp
View File

@ -207,10 +207,10 @@ std::string Demangle(const std::string& Symbol) {
~AutoFree() { ::free(Str); };
};
int status = 0;
size_t len;
AutoFree af(abi::__cxa_demangle(Symbol.c_str(), 0, &len, &status));
assert((status != 0 || (len && af.Str[len-1]==0)) && "Not null terminated");
return status == 0 ? std::string(af.Str, len-1) : std::string();
// Some implementations of __cxa_demangle are giving back length of allocation
// Passing NULL for length seems to guarantee null termination.
AutoFree af(abi::__cxa_demangle(Symbol.c_str(), NULL, NULL, &status));
return status == 0 ? std::string(af.Str) : std::string();
}
} // namespace platform