Changeset 1955

Timestamp:

May 13, 2008 7:24:45 PM (16 years ago)

Author:

nanang

Message:

Resample port get frame may cause buffer overflow when downport returns non-audio frame

File:

• pjproject/trunk/pjmedia/src/pjmedia/resample_port.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/resample_port.c

@@ -186 +186 @@
         frame->type = tmp_frame.type;
         frame->timestamp = tmp_frame.timestamp;
-        frame->size = tmp_frame.size;
+        /* Copy whatever returned as long as the buffer size is enough */
+        frame->size = tmp_frame.size < rport->base.info.bytes_per_frame ?
+                      tmp_frame.size : rport->base.info.bytes_per_frame;
         if (tmp_frame.size)
-            pj_memcpy(frame->buf, tmp_frame.buf, tmp_frame.size);
+            pjmedia_copy_samples(frame->buf, tmp_frame.buf, frame->size >> 1);
         return PJ_SUCCESS;
     }