Changeset 3878 for pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

Timestamp:

Oct 31, 2011 10:31:23 AM (11 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3833:r3877

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/wav_player.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -462 +462 @@
     fport = (struct file_reader_port*) port;
 
-    PJ_ASSERT_RETURN(bytes < fport->fsize - fport->start_data, PJ_EINVAL);
+    /* Check that this offset does not pass the audio-data (in case of
+     * extra chunk after audio data chunk
+     */
+    PJ_ASSERT_RETURN(bytes < fport->data_len, PJ_EINVAL);
 
     fport->fpos = fport->start_data + bytes;
+    fport->data_left = fport->data_len - bytes;
     pj_file_setpos( fport->fd, fport->fpos, PJ_SEEK_SET);