kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve FORWARD_NULL static analysis warnings

Browse Source 
This resolves core findings from ASTERISK-19650 numbers 0-2, 6, 7, 9-11, 14-20,
22-24, 28, 30-32, 34-36, 42-56, 82-84, 87, 89-90, 93-102, 104, 105, 109-111,
and 115. Finding numbers 26, 33, and 29 were already resolved.  Those skipped
were either extended/deprecated or in areas of code that shouldn't be
disturbed.

(Closes issue ASTERISK-19650)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@366167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2012-05-10 20:50:47 +00:00
parent ae528efea3
commit a94fcae21b
27 changed files with 325 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/cdr.c
View File

@@ -573,7 +573,9 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
lfrom = lfrom->next;
}
/* rip off the last entry and put a copy of the to at the end */
llfrom->next = to;
if (llfrom) {
llfrom->next = to;
}
from = lfrom;
} else {
/* save copy of the current *to cdr */
@@ -589,10 +591,11 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from)
}
from->next = NULL;
/* rip off the last entry and put a copy of the to at the end */
if (llfrom == from)
if (llfrom == from) {
to = to->next = ast_cdr_dup(&tcdr);
else
} else if (llfrom) {
to = llfrom->next = ast_cdr_dup(&tcdr);
}
from = lfrom;
}
}