[patch] CAN-2004-1300.patch

djb_demux_aiff.patch (text/plain), 991 bytes, created by Thierry Carrez (RETIRED) on 2004-12-22 07:45:11 UTC

===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_aiff.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xine/xine-lib/src/demuxers/demux_aiff.c	2004/06/13 21:28:52	1.39
+++ xine/xine-lib/src/demuxers/demux_aiff.c	2004/12/15 21:03:02	1.40
@@ -21,7 +21,7 @@
 /*
  * AIFF File Demuxer by Mike Melanson ([e-mail])
  *
- * $Id: demux_aiff.c,v 1.39 2004/06/13 21:28:52 miguelfreitas Exp $
+ * $Id: demux_aiff.c,v 1.40 2004/12/15 21:03:02 mroi Exp $
  *
  */
 
@@ -120,6 +120,12 @@
     }
     chunk_type = BE_32(&preamble[0]);
     chunk_size = BE_32(&preamble[4]);
+    
+    if (chunk_size > sizeof(buffer) / sizeof(buffer[0])) {
+      /* the chunk is too large to fit in the buffer -> this cannot be an aiff chunk */
+      this->status = DEMUX_FINISHED;
+      return 0;
+    }
 
     if (chunk_type == COMM_TAG) {
       if (this->input->read(this->input, buffer, chunk_size) !=