]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix code analysis warnings - this time while awake
authorJeff Lenk <jeff@jefflenk.com>
Thu, 26 May 2011 16:32:07 +0000 (11:32 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Thu, 26 May 2011 16:32:07 +0000 (11:32 -0500)
libs/esl/src/esl_event.c

index d3c4b4c072227f5c09b1a8f326fa29412aa60bee..8280f3e892bdc33429dcc66df2f3ff259a440f05 100644 (file)
@@ -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();
                        }
                }