Merge "libsysutils: fix null pointer and memory leak issue" (51a2e4d5) · Commits · e / os / android_system_core

libsysutils/src/SocketClient.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}