pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix memory leak in String16"

This commit is contained in:
Treehugger Robot 2019-10-01 23:17:30 +00:00 committed by Gerrit Code Review
parent 88f50f536f 5a141424e6
commit 9a66161585
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libutils/String16.cpp
View File

@ -346,7 +346,6 @@ void* String16::edit() {
if (isStaticString()) { if (isStaticString()) {
buf = static_cast<SharedBuffer*>(alloc((size() + 1) * sizeof(char16_t))); buf = static_cast<SharedBuffer*>(alloc((size() + 1) * sizeof(char16_t)));
if (buf) { if (buf) {
buf->acquire();
memcpy(buf->data(), mString, (size() + 1) * sizeof(char16_t)); memcpy(buf->data(), mString, (size() + 1) * sizeof(char16_t));
} }
} else { } else {
@ -365,7 +364,6 @@ void* String16::editResize(size_t newSize) {
} }
buf = static_cast<SharedBuffer*>(alloc(newSize)); buf = static_cast<SharedBuffer*>(alloc(newSize));
if (buf) { if (buf) {
buf->acquire();
memcpy(buf->data(), mString, copySize); memcpy(buf->data(), mString, copySize);
} }
} else { } else {