Changeset 282

Timestamp:

Mar 5, 2006 11:51:10 AM (19 years ago)

Author:

bennylp

Message:

Added assert checking in speex codec

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

@@ -677 +677 @@
 {
     struct spx_private *spx;
-    float tmp[640]; /* 20ms at 32KHz */
+    float tmp[642]; /* 20ms at 32KHz + 2 */
     pj_int16_t *samp_in;
-    unsigned i, samp_count;
+    unsigned i, samp_count, sz;
 
     spx = (struct spx_private*) codec->codec_data;
@@ -693 +693 @@
     /* Copy frame to float buffer. */
     samp_count = input->size / 2;
+    pj_assert(samp_count <= PJ_ARRAY_SIZE(tmp));
     samp_in = input->buf;
     for (i=0; i<samp_count; ++i) {
@@ -703 +704 @@
     /* Encode the frame */
     speex_encode(spx->enc, tmp, &spx->enc_bits);
+
+    /* Check size. */
+    sz = speex_bits_nbytes(&spx->enc_bits);
+    pj_assert(sz <= output_buf_len);
 
     /* Copy the bits to an array of char that can be written */
@@ -722 +727 @@
 {
     struct spx_private *spx;
-    float tmp[640]; /* 20ms at 32KHz */
+    float tmp[642]; /* 20ms at 32KHz + 2 */
     pj_int16_t *dst_buf;
-    unsigned i, count;
+    unsigned i, count, sz;
 
     spx = (struct spx_private*) codec->codec_data;
@@ -745 +750 @@
     speex_decode(spx->dec, &spx->dec_bits, tmp);
 
+    /* Check size. */
+    sz = speex_bits_nbytes(&spx->enc_bits);
+    pj_assert(sz <= output_buf_len);
+
+    /* Copy from float to short samples. */
     count = spx_factory.speex_param[spx->param_id].clock_rate * 20 / 1000;
+    pj_assert((count <= output_buf_len/2) && count <= PJ_ARRAY_SIZE(tmp));
     dst_buf = output->buf;
     for (i=0; i<count; ++i) {