Fixed buffer handling in ts2pkt

Added TS PAT/PMT handling in markad-standalone

1 files changed, 17 insertions, 3 deletions

diff --git a/ts2pkt.cpp b/ts2pkt.cpp
index 2aca980..049d8e4 100644
--- a/ts2pkt.cpp
+++ b/ts2pkt.cpp
@@ -235,13 +235,17 @@ int cMarkAdTS2Pkt::Process(MarkAdPid Pid, uchar *TSData, int TSSize, uchar **Pkt
                 Reset(MA_ERR_TOBIG);
                 return TS_SIZE;
             }
-            if (buflen<=0)
+            if (buflen<0)
             {
                 // error in size
                 Reset(MA_ERR_NEG);
                 return TS_SIZE;
             }
-
+            if (buflen==0)
+            {
+                // no data?
+                return TS_SIZE;
+            }
         }
         pktdata=(uchar *) realloc(pktdata,pktsize+buflen);
         if (!pktdata)
@@ -307,11 +311,21 @@ int cMarkAdTS2Pkt::Process(MarkAdPid Pid, uchar *TSData, int TSSize, uchar **Pkt
     pktdatalast=pktdata;
 
     int bufleftsize=pktsize-(pktinfo.pkthdr+size);
-    if (bufleftsize<=0)
+    if (bufleftsize<0)
     {
+        pktdata=NULL;
         Reset(MA_ERR_NEG);
         return bytes_processed;
     }
+
+    if (bufleftsize==0)
+    {
+        pktinfo.pkthdr=-1;
+        pktdata=NULL;
+        pktsize=0;
+        return bytes_processed;
+    }
+
     uchar *bufleft=(uchar *) malloc(bufleftsize);
     if (!bufleft)
     {