Changeset 3250

Timestamp:

Aug 5, 2010 10:41:48 AM (14 years ago)

Author:

nanang

Message:

Re #1072: fixed buffer overflow bugs introduced by r3202.

Location:

pjproject/trunk/pjmedia/src/pjmedia-codec

Files:

• g722.c (modified) (1 diff)
• g722/g722_dec.c (modified) (2 diffs)

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

@@ -589 +589 @@
 
         p = (pj_int16_t*)input->buf;
-        end = p + input->size;
+        end = p + input->size/2;
         while (p < end) {
             *p++ >>= g722_data->pcm_shift;

pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_dec.c

@@ -505 +505 @@
     int ilowr, ylow, rlow, dlowt;
     int ihigh, rhigh, dhigh;
+    int pcm1, pcm2;
     pj_uint8_t *in_ = (pj_uint8_t*) in;
 
@@ -529 +530 @@
         /* rhigh <= output high band pcm */
 
-        rx_qmf(dec, rlow, rhigh, &out[i*2], &out[i*2+1]);
+        rx_qmf(dec, rlow, rhigh, &pcm1, &pcm2);
+        out[i*2]   = (pj_int16_t)pcm1;
+        out[i*2+1] = (pj_int16_t)pcm2;
     }