automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@15783 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 6 deletions

diff --git a/strcompat.c b/strcompat.c
index 38615ac5d..233bacc86 100644
--- a/strcompat.c
+++ b/strcompat.c
@@ -33,21 +33,18 @@ char* strsep(char** str, const char* delims)
 int setenv(const char *name, const char *value, int overwrite)
 {
 	unsigned char *buf;
-	int buflen, ret;
+	int buflen;
 
 	buflen = strlen(name) + strlen(value) + 2;
-	if ((buf = malloc(buflen)) == NULL)
+	if (!(buf = alloca(buflen)))
  		return -1;
 
 	if (!overwrite && getenv(name))
 		return 0;
 
 	snprintf(buf, buflen, "%s=%s", name, value);
-	ret = putenv(buf);
 
-	free(buf);
-
-	return ret;
+	return putenv(buf);
 }
 
 int unsetenv(const char *name)