From 539c0da85348b52534429bed7ff0a5ea24bbf00f Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 13 May 2010 14:39:41 +0200 Subject: Fixed a possible out of buffer memory access in case of bad TS data --- remux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'remux.c') diff --git a/remux.c b/remux.c index 3ac83dd7..80ebeb77 100644 --- a/remux.c +++ b/remux.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.c 2.44 2010/04/18 13:40:20 kls Exp $ + * $Id: remux.c 2.45 2010/05/13 14:16:56 kls Exp $ */ #include "remux.h" @@ -663,6 +663,10 @@ void cTsToPes::PutTs(const uchar *Data, int Length) if (length + Length > size) { size = max(KILOBYTE(2), length + Length); data = (uchar *)realloc(data, size); + if (!data) { + Reset(); + return; + } } memcpy(data + length, Data, Length); length += Length; -- cgit v1.2.3