From 82a13c7a0ec7f709335c603f94e4498e4e5fc637 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 20 Feb 2011 17:37:24 +0100
Subject: Fixed reallocating memory in cTsToPes::PutTs()

---
 remux.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'remux.c')

diff --git a/remux.c b/remux.c
index b30b12ca..fd47d3c3 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.48 2010/11/01 12:29:17 kls Exp $
+ * $Id: remux.c 2.49 2011/02/20 17:27:47 kls Exp $
  */
 
 #include "remux.h"
@@ -666,9 +666,12 @@ void cTsToPes::PutTs(const uchar *Data, int Length)
      return; // skip everything before the first payload start
   Length = TsGetPayload(&Data);
   if (length + Length > size) {
-     size = max(KILOBYTE(2), length + Length);
-     data = (uchar *)realloc(data, size);
-     if (!data) {
+     int NewSize = max(KILOBYTE(2), length + Length);
+     if (uchar *NewData = (uchar *)realloc(data, NewSize)) {
+        data = NewData;
+        size = NewSize;
+        }
+     else {
         Reset();
         return;
         }
-- 
cgit v1.2.3