Contents of /trunk/mplayer/patches/mplayer-1.0_pre7-demuxer_h_fix_20060212.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1118 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1118 byte(s)
-import
1 | Index: libmpdemux/demuxer.h |
2 | =================================================================== |
3 | RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v |
4 | retrieving revision 1.87 |
5 | retrieving revision 1.90 |
6 | diff -u -r1.87 -r1.90 |
7 | --- libmpdemux/demuxer.h 9 Feb 2006 19:39:51 -0000 1.87 |
8 | +++ libmpdemux/demuxer.h 12 Feb 2006 17:01:30 -0000 1.90 |
9 | @@ -190,17 +190,19 @@ |
10 | dp->flags=0; |
11 | dp->refcount=1; |
12 | dp->master=NULL; |
13 | - dp->buffer=len?(unsigned char*)malloc(len+8):NULL; |
14 | - if(len) memset(dp->buffer+len,0,8); |
15 | + dp->buffer=NULL; |
16 | + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8))) |
17 | + memset(dp->buffer + len, 0, 8); |
18 | + else |
19 | + dp->len = 0; |
20 | return dp; |
21 | } |
22 | |
23 | inline static void resize_demux_packet(demux_packet_t* dp, int len) |
24 | { |
25 | - if(len) |
26 | + if(len > 0) |
27 | { |
28 | dp->buffer=(unsigned char *)realloc(dp->buffer,len+8); |
29 | - memset(dp->buffer+len,0,8); |
30 | } |
31 | else |
32 | { |
33 | @@ -208,6 +210,10 @@ |
34 | dp->buffer=NULL; |
35 | } |
36 | dp->len=len; |
37 | + if (dp->buffer) |
38 | + memset(dp->buffer + len, 0, 8); |
39 | + else |
40 | + dp->len = 0; |
41 | } |
42 | |
43 | inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){ |