diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-06-11 04:27:28 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-06-11 04:27:28 -0700 |
commit | f1c038529d31462ab206d759e02c7f5cd01edfa4 (patch) | |
tree | 08f150e055923bddc566cebc47d35821ef1089d0 | |
parent | 26be679a20239eeb00f3aee5080ae600f499910f (diff) | |
parent | de5ae87b9370028996adaf91732a95c27c6c8bac (diff) | |
download | system_core-f1c038529d31462ab206d759e02c7f5cd01edfa4.zip system_core-f1c038529d31462ab206d759e02c7f5cd01edfa4.tar.gz system_core-f1c038529d31462ab206d759e02c7f5cd01edfa4.tar.bz2 |
Merge "libsysutils: fix null pointer and memory leak issue" into cm-10.1
-rw-r--r-- | libsysutils/src/SocketClient.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp index 3d4984d..ae0e077 100644 --- a/libsysutils/src/SocketClient.cpp +++ b/libsysutils/src/SocketClient.cpp @@ -112,6 +112,12 @@ char *SocketClient::quoteArg(const char *arg) { char *result = (char *)malloc(len * 2 + 3); char *current = result; const char *end = arg + len; + char *oldresult; + + if(result == NULL) { + SLOGW("malloc error (%s)", strerror(errno)); + return NULL; + } *(current++) = '"'; while (arg < end) { @@ -125,8 +131,9 @@ char *SocketClient::quoteArg(const char *arg) { } *(current++) = '"'; *(current++) = '\0'; + oldresult = result; // save pointer in case realloc fails result = (char *)realloc(result, current-result); - return result; + return result ? result : oldresult; } |