Mercurial > mplayer.hg

diff libmpdemux/demux_viv.c @ 18558:4928dd61f136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix potential integer overflows in memory allocation. Patch by Rich and me
author rtogni
date Sun, 04 Jun 2006 22:41:27 +0000
parents 934380353fd6
children 9e2b300db17b
line wrap: on
line diff
--- a/libmpdemux/demux_viv.c	Fri Jun 02 11:31:42 2006 +0000
+++ b/libmpdemux/demux_viv.c	Sun Jun 04 22:41:27 2006 +0000
@@ -387,6 +387,8 @@
       } else {
         // append data to it!
         demux_packet_t* dp=ds->asf_packet;
+        if(dp->len + len + FF_INPUT_BUFFER_PADDING_SIZE < 0)
+	    return 0;
         dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE);
         memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
         //memcpy(dp->buffer+dp->len,data,len);