Ticket #5545: t5545_debug_1.diff

libs/libmythtv/mpeg/pespacket.cpp

@@ -52 +52 @@
         {
             uint sz = (((_allocSize * 2) + 4095) / 4096) * 4096;
             unsigned char *nbuf = pes_alloc(sz);
+            if (!nbuf)
+            {
+                VERBOSE(VB_IMPORTANT,
+                        QString("pes_alloc failed to allocate %1 bytes for a "
+                                "packet on PID 0x%2").arg(sz)
+                        .arg(packet->PID(),0,16));
+                _badPacket = true;
+                return true;
+            }
             memcpy(nbuf, _fullbuffer, _pesdataSize);
             pes_free(_fullbuffer);
             _fullbuffer = nbuf;
@@ -333 +342 @@
 
 unsigned char *pes_alloc(uint size)
 {
+    if (size > 1<<16)
+    {
+        VERBOSE(VB_IMPORTANT, QString("Allocating a %1 byte PES packet failed")
+                .arg(size));
+        return NULL;
+    }
     QMutexLocker locker(&pes_alloc_mutex);
 #ifndef USING_VALGRIND
     if (size <= 188)