mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
Resolve FORWARD_NULL static analysis warnings
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) ........ Merged revisions 366167 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 366168 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@366169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -512,8 +512,10 @@ int dundi_ie_append_cause(struct dundi_ie_data *ied, unsigned char ie, unsigned
|
||||
ied->buf[ied->pos++] = ie;
|
||||
ied->buf[ied->pos++] = datalen;
|
||||
ied->buf[ied->pos++] = cause;
|
||||
memcpy(ied->buf + ied->pos, data, datalen-1);
|
||||
ied->pos += datalen-1;
|
||||
if (data) {
|
||||
memcpy(ied->buf + ied->pos, data, datalen-1);
|
||||
ied->pos += datalen-1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -531,8 +533,10 @@ int dundi_ie_append_hint(struct dundi_ie_data *ied, unsigned char ie, unsigned s
|
||||
flags = htons(flags);
|
||||
memcpy(ied->buf + ied->pos, &flags, sizeof(flags));
|
||||
ied->pos += 2;
|
||||
memcpy(ied->buf + ied->pos, data, datalen-1);
|
||||
ied->pos += datalen-2;
|
||||
if (data) {
|
||||
memcpy(ied->buf + ied->pos, data, datalen-2);
|
||||
ied->pos += datalen-2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user