kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: memory leaks, resource leaks, out of bounds and bugs

Browse Source 
ASTERISK-26119 #close

Change-Id: Iecbf7d0f360a021147344c4e83ab242fd1e7512c
This commit is contained in:
Alexei Gradinari
2016-06-17 14:51:57 -04:00
parent 947f76a971
commit 820ed3d4b3
6 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/ast_expr2.c
View File

@@ -3669,13 +3669,20 @@ op_tildetilde (struct val *a, struct val *b)
/* strip double quotes from both -- */
strip_quotes(a);
strip_quotes(b);
vs = malloc(strlen(a->u.s)+strlen(b->u.s)+1);
if (vs == NULL) {
ast_log(LOG_WARNING, "malloc() failed\n");
return NULL;
}
strcpy(vs,a->u.s);
strcat(vs,b->u.s);
v = make_str(vs);
free(vs);
/* free arguments */
free_value(a);
free_value(b);

9
main/ast_expr2.y
View File

@@ -1662,13 +1662,20 @@ op_tildetilde (struct val *a, struct val *b)
/* strip double quotes from both -- */
strip_quotes(a);
strip_quotes(b);
vs = malloc(strlen(a->u.s)+strlen(b->u.s)+1);
if (vs == NULL) {
ast_log(LOG_WARNING, "malloc() failed\n");
return NULL;
}
strcpy(vs,a->u.s);
strcat(vs,b->u.s);
v = make_str(vs);
free(vs);
/* free arguments */
free_value(a);
free_value(b);

4
main/say.c
View File

@@ -8521,9 +8521,9 @@ int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const cha
/* NOTE: if you add more options here, please try to be consistent with strftime(3) */
case '\'':
/* Literal name of a sound file */
sndoffset=0;
for (sndoffset=0 ; (format[++offset] != '\'') && (sndoffset < 256) ; sndoffset++)
for (sndoffset = 0 ; (format[++offset] != '\'') && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) {
sndfile[sndoffset] = format[offset];
}
sndfile[sndoffset] = '\0';
res = wait_file(chan,ints,sndfile,lang);
break;