automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge script 19 years ago
parent ace0f74f27
commit e993f73211

@ -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) {

Loading…
Cancel
Save