1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
$NetBSD: patch-aj,v 1.1 2006/04/13 14:05:34 drochner Exp $
--- libmpdemux/demuxer.h.orig 2005-04-03 16:08:26.000000000 +0200
+++ libmpdemux/demuxer.h
@@ -155,17 +155,19 @@ inline static demux_packet_t* new_demux_
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
{
@@ -173,6 +175,10 @@ inline static void resize_demux_packet(d
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){
|
