diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-03-05 04:21:28 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-03-05 04:21:28 +0000 |
| commit | 1db9dc0c9a9441eaae60cd26b2397068dbaec048 (patch) | |
| tree | 70620075836ee0e4348b4768180346188d585539 /main/slinfactory.c | |
| parent | 1dd8e4b0b5d0c61550f091d53fa30bdf6980c7d0 (diff) | |
Merged revisions 57798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57798 | file | 2007-03-04 23:19:53 -0500 (Sun, 04 Mar 2007) | 2 lines
Don't allow a NULL pointer to reach ast_frdup. (issue #9155 reported by cmaj)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/slinfactory.c')
| -rw-r--r-- | main/slinfactory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index a07798b7c..6171eb2e2 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -56,7 +56,7 @@ void ast_slinfactory_destroy(struct ast_slinfactory *sf) int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) { - struct ast_frame *frame, *frame_ptr; + struct ast_frame *begin_frame = f, *duped_frame = NULL, *frame_ptr; unsigned int x; if (f->subclass != AST_FORMAT_SLINEAR) { @@ -74,16 +74,16 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) } } - if (!(frame = ast_frdup( (sf->trans) ? ast_translate(sf->trans, f, 0) : f ))) + if ((sf->trans && (!(begin_frame = ast_translate(sf->trans, f, 0)))) || (!(duped_frame = ast_frdup(begin_frame)))) return 0; x = 0; AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list) x++; - AST_LIST_INSERT_TAIL(&sf->queue, frame, frame_list); + AST_LIST_INSERT_TAIL(&sf->queue, duped_frame, frame_list); - sf->size += frame->samples; + sf->size += duped_frame->samples; return x; } |