Merged revisions 32582 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Jun 2006 16:05:29 +0000 (16:05 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 6 Jun 2006 16:05:29 +0000 (16:05 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r32582 | tilghman | 2006-06-06 11:02:43 -0500 (Tue, 06 Jun 2006) | 2 lines

Bug 7268 - Callerid leaks memory on error

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32596 65c4cc65-6c06-0410-ace0-fbb531ad65f3

callerid.c

index 195ae1f..1b52447 100644 (file)
@@ -557,6 +557,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
                res = fsk_serie(&cid->fskd, buf, &mylen, &b);
                if (mylen < 0) {
                        ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen);
+                       free(obuf);
                        return -1;
                }
                buf += (olen - mylen);
@@ -590,6 +591,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
                        case 4: /* Retrieve message */
                                if (cid->pos >= 128) {
                                        ast_log(LOG_WARNING, "Caller ID too long???\n");
+                                       free(obuf);
                                        return -1;
                                }
                                cid->rawdata[cid->pos++] = b;
@@ -675,6 +677,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
                                        strcpy(cid->name, "");
                                        cid->flags |= CID_UNKNOWN_NAME;
                                }
+                               free(obuf);
                                return 1;
                                break;
                        default: