From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 26 May 2011 16:32:07 +0000 (-0500)
Subject: fix code analysis warnings - this time while awake
X-Git-Tag: v1.2-rc1~108^2~11^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cd07bc2418ada194615cf733744b99910ab47b3;p=thirdparty%2Ffreeswitch.git

fix code analysis warnings - this time while awake
---

diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index d3c4b4c072..8280f3e892 100644
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -391,8 +391,8 @@ ESL_DECLARE(int) esl_event_add_array(esl_event_t *event, const char *var, const
 	data = strdup(val + 7);
 	
 	len = (sizeof(char *) * max) + 1;
-	esl_assert(len);
 	array = malloc(len);
+	esl_assert(array);
 	memset(array, 0, len);
 	
 	idx = esl_separate_string_string(data, "|:", array, max);
@@ -794,10 +794,12 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
 
 		if ((len + llen) > dlen) {
 			char *m;
+			char *old = buf;
 			dlen += (blocksize + (len + llen));
 			if ((m = realloc(buf, dlen))) {
 				buf = m;
 			} else {
+				buf = old;
 				abort();
 			}
 		}
@@ -821,10 +823,12 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
 
 		if ((len + llen) > dlen) {
 			char *m;
+			char *old = buf;
 			dlen += (blocksize + (len + llen));
 			if ((m = realloc(buf, dlen))) {
 				buf = m;
 			} else {
+				buf = old;
 				abort();
 			}
 		}