diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-27 20:13:17 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-27 20:13:17 +0000 |
commit | a22afaaf67be58ee0537e86aff0bec51300e9f69 (patch) | |
tree | d921d5ccfdb56e403f756e4dfbeb4a088a09bf3a /main/slinfactory.c | |
parent | 6dba51e527b6b3c37b55089606400c76a5731864 (diff) |
Merged revisions 171622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r171622 | mmichelson | 2009-01-27 14:11:30 -0600 (Tue, 27 Jan 2009) | 26 lines
Merged revisions 171621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r171621 | mmichelson | 2009-01-27 14:06:01 -0600 (Tue, 27 Jan 2009) | 18 lines
Prevent a crash from occurring when a jitter buffer interpolated frame is
removed from a slinfactory
slinfactory used the "samples" field of an ast_frame in order to determine
the amount of data contained within the frame. In certain cases, such as
jitter buffer interpolated frames, the frame would have a non-zero value for
"samples" but have NULL "data"
This caused a problem when a memcpy call in ast_slinfactory_read would attempt
to access invalid memory. The solution in use here is to never feed frames into
the slinfactory if they have NULL "data"
(closes issue #13116)
Reported by: aragon
Patches:
13116.diff uploaded by putnopvut (license 60)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@171623 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/slinfactory.c')
-rw-r--r-- | main/slinfactory.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index 0d6e81b68..4b71db42d 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -56,6 +56,16 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f) struct ast_frame *begin_frame = f, *duped_frame = NULL, *frame_ptr; unsigned int x; + /* In some cases, we can be passed a frame which has no data in it, but + * which has a positive number of samples defined. Once such situation is + * when a jitter buffer is in use and the jitter buffer interpolates a frame. + * The frame it produces has data set to NULL, datalen set to 0, and samples + * set to either 160 or 240. + */ + if (!f->data) { + return 0; + } + if (f->subclass != AST_FORMAT_SLINEAR && f->subclass != AST_FORMAT_SLINEAR16) { if (sf->trans && f->subclass != sf->format) { ast_translator_free_path(sf->trans); |