Ticket #8261: CreateBuffers_check_NULL.patch

libs/libmythtv/videobuffers.cpp

@@ -1133 +1133 @@
     {
         unsigned char *data = (unsigned char*)av_malloc(buf_size + 64);
 
-        bufs.push_back(data);
-        yuvinfo.push_back(YUVInfo(width, height, buf_size, NULL, NULL));
-
-        if (bufs.back())
+        if (data == NULL)
         {
-            VERBOSE(VB_PLAYBACK+VB_EXTRA, "Created data @"
-                    <<((void*)data)<<"->"<<((void*)(data+buf_size)));
-            allocated_arrays.push_back(bufs.back());
+            VERBOSE(VB_IMPORTANT,
+                    QString("VideoBuffers::CreateBuffers "
+                            "called with width %1, height %2, bufs.size() %3\n"
+                            "av_malloc(%4) failed")
+                    .arg(width).arg(height)
+                    .arg(bufs.size()).arg(buf_size + 64));
+            ok = false;
         }
         else
-            ok = false;
+        {
+            bufs.push_back(data);
+            yuvinfo.push_back(YUVInfo(width, height, buf_size, NULL, NULL));
+
+            if (bufs.back())
+            {
+                VERBOSE(VB_PLAYBACK+VB_EXTRA, "Created data @"
+                        <<((void*)data)<<"->"<<((void*)(data+buf_size)));
+                allocated_arrays.push_back(bufs.back());
+            }
+            else
+                ok = false;
+        }
     }
 
     for (uint i = 0; i < allocSize(); i++)