automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46882 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/callerid.c b/callerid.c
index f709bd501796223874d06507470a5c887965d6f5..39690eed954f1365a120926663772670f3c52f39 100644 (file)
--- a/callerid.c
+++ b/callerid.c
@@ -280,6 +280,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
                buf += (olen - mylen);
                if (res < 0) {
                        ast_log(LOG_NOTICE, "fsk_serie failed\n");
+                       free(obuf);
                        return -1;
                }
                if (res == 1) {