ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsysutils: fix null pointer and memory leak issue"

Browse source
This commit is contained in:
Colin Cross 2013-05-21 21:13:50 +00:00 • committed by Gerrit Code Review
commit 51a2e4d5d4
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libsysutils/src/SocketClient.cpp
View file

@ -112,6 +112,12 @@ char *SocketClient::quoteArg(const char *arg) {
char *result = (char *)malloc(len * 2 + 3); char *result = (char *)malloc(len * 2 + 3);
char *current = result; char *current = result;
const char *end = arg + len; const char *end = arg + len;
char *oldresult;
if(result == NULL) {
SLOGW("malloc error (%s)", strerror(errno));
return NULL;
}
*(current++) = '"'; *(current++) = '"';
while (arg < end) { while (arg < end) {
@ -125,8 +131,9 @@ char *SocketClient::quoteArg(const char *arg) {
} }
*(current++) = '"'; *(current++) = '"';
*(current++) = '\0'; *(current++) = '\0';
oldresult = result; // save pointer in case realloc fails
result = (char *)realloc(result, current-result); result = (char *)realloc(result, current-result);
return result; return result ? result : oldresult;
} }