Ticket #6188: 0003-Correctly-check-when-the-BBuffer-failed-the-registra.patch

src/kits/media/BufferCache.cpp

@@ -42 +42 @@
     buffer_clone_info info;
     info.buffer = id;
     BBuffer* buffer = new(std::nothrow) BBuffer(info);
-    if (buffer == NULL)
+    if (buffer == NULL || buffer->Data() == NULL) {
+        delete buffer;
         return NULL;
+    }
 
     try {
         fMap.insert(std::make_pair(id, buffer));

src/kits/media/BufferConsumer.cpp

@@ -385 +385 @@
                 = static_cast<const consumer_buffer_received_command*>(data);
 
             BBuffer* buffer = fBufferCache->GetBuffer(command->buffer);
-            buffer->SetHeader(&command->header);
-
-            PRINT(4, "calling BBufferConsumer::BufferReceived buffer %ld at "
-                "perf %Ld and TimeSource()->Now() is %Ld\n",
-                buffer->Header()->buffer, buffer->Header()->start_time,
-                TimeSource()->Now());
-
-            BufferReceived(buffer);
+            if (buffer == NULL) {
+                ERROR("BBufferConsumer::CONSUMER_BUFFER_RECEIVED can't"
+                    "find the buffer\n");
+            } else {
+                buffer->SetHeader(&command->header);
+
+                PRINT(4, "calling BBufferConsumer::BufferReceived buffer %ld "
+                    "at perf %Ld and TimeSource()->Now() is %Ld\n",
+                    buffer->Header()->buffer, buffer->Header()->start_time,
+                    TimeSource()->Now());
+
+                BufferReceived(buffer);
+            }
             return B_OK;
         }