SOURCES: demuxer_h_fix_20060212.diff (NEW) - from http://www.mplay...

[qboosh]

Author: qboosh                       Date: Tue Feb 28 10:19:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from http://www.mplayerhq.hu/MPlayer/patches/demuxer_h_fix_20060212.diff
  (fixes CAN-2006-0579)

---- Files affected:
SOURCES:
   demuxer_h_fix_20060212.diff (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/demuxer_h_fix_20060212.diff
diff -u /dev/null SOURCES/demuxer_h_fix_20060212.diff:1.1
--- /dev/null	Tue Feb 28 11:19:01 2006
+++ SOURCES/demuxer_h_fix_20060212.diff	Tue Feb 28 11:18:56 2006
@@ -0,0 +1,43 @@
+Index: libmpdemux/demuxer.h
+===================================================================
+RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
+retrieving revision 1.87
+retrieving revision 1.90
+diff -u -r1.87 -r1.90
+--- libmpdemux/demuxer.h	9 Feb 2006 19:39:51 -0000	1.87
++++ libmpdemux/demuxer.h	12 Feb 2006 17:01:30 -0000	1.90
+@@ -190,17 +190,19 @@
+   dp->flags=0;
+   dp->refcount=1;
+   dp->master=NULL;
+-  dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
+-  if(len) memset(dp->buffer+len,0,8);
++  dp->buffer=NULL;
++  if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8)))
++    memset(dp->buffer + len, 0, 8);
++  else
++    dp->len = 0;
+   return dp;
+ }
+ 
+ inline static void resize_demux_packet(demux_packet_t* dp, int len)
+ {
+-  if(len)
++  if(len > 0)
+   {
+      dp->buffer=(unsigned char *)realloc(dp->buffer,len+8);
+-     memset(dp->buffer+len,0,8);
+   }
+   else
+   {
+@@ -208,6 +210,10 @@
+      dp->buffer=NULL;
+   }
+   dp->len=len;
++  if (dp->buffer)
++     memset(dp->buffer + len, 0, 8);
++  else
++     dp->len = 0;
+ }
+ 
+ inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){
================================================================