summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2008-08-08 07:03:21 +0000
committerNanang Izzuddin <nanang@teluu.com>2008-08-08 07:03:21 +0000
commit79d6cb738dc41982cdf169d9f346cf8a3ab48865 (patch)
treee87bded3bf90658066feaab51830d3004a82f480
parentb2a88bf19bf545fbe4da1de0bb40f0e2469dcb46 (diff)
Fixed bug possibility of dereferencing NULL pointer when calling pjmedia_jbuf_get_frame() (thanks Joel Dodson)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2197 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/jbuf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/jbuf.c b/pjmedia/src/pjmedia/jbuf.c
index 796ff071..dc2eb605 100644
--- a/pjmedia/src/pjmedia/jbuf.c
+++ b/pjmedia/src/pjmedia/jbuf.c
@@ -592,7 +592,8 @@ PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb,
else
*p_frame_type = PJMEDIA_JB_ZERO_PREFETCH_FRAME;
- *size = 0;
+ if (size)
+ *size = 0;
return;
}
@@ -606,7 +607,8 @@ PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb,
/* Can't return frame because jitter buffer is empty! */
pj_bzero(frame, jb->jb_frame_size);
*p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
- *size = 0;
+ if (size)
+ *size = 0;
return;
}