diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-11-11 10:09:06 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2018-11-11 10:09:06 +0000 |
| commit | 3591960d573d96b352c372b14f50af2ace54240e (patch) | |
| tree | b3cafd4a53d99e0c0824fbf824428fbba783d969 | |
| parent | 150fc2eb17670ba414efb3e41894428b8263f782 (diff) | |
| download | libcxxabi-3591960d573d96b352c372b14f50af2ace54240e.tar.gz | |
Port LLVM r346606 to libcxxabi.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@346607 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | src/cxa_demangle.cpp | 2 | ||||
| -rw-r--r-- | src/demangle/Utility.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp index 69fdca4..f227add 100644 --- a/src/cxa_demangle.cpp +++ b/src/cxa_demangle.cpp @@ -352,7 +352,7 @@ __cxa_demangle(const char *MangledName, char *Buf, size_t *N, int *Status) { if (AST == nullptr) InternalStatus = demangle_invalid_mangled_name; - else if (initializeOutputStream(Buf, N, S, 1024)) + else if (!initializeOutputStream(Buf, N, S, 1024)) InternalStatus = demangle_memory_alloc_failure; else { assert(Parser.ForwardTemplateRefs.empty()); diff --git a/src/demangle/Utility.h b/src/demangle/Utility.h index 8611376..b5e9b5e 100644 --- a/src/demangle/Utility.h +++ b/src/demangle/Utility.h @@ -176,13 +176,13 @@ inline bool initializeOutputStream(char *Buf, size_t *N, OutputStream &S, if (Buf == nullptr) { Buf = static_cast<char *>(std::malloc(InitSize)); if (Buf == nullptr) - return true; + return false; BufferSize = InitSize; } else BufferSize = *N; S.reset(Buf, BufferSize); - return false; + return true; } } // namespace |