Fix ChunkDemuxer seek deadlock

media/webm/webm_cluster_parser.cc

Index: media/webm/webm_cluster_parser.cc
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
index 8151ec6b4604a90eb24eef0a72c6921137e69f9a..7b9ba5600da3833f1b4cb74710d760f1970c50d3 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/webm/webm_cluster_parser.cc
@@ -11,8 +11,10 @@
 namespace media {
 
 static Buffer* CreateBuffer(const uint8* data, size_t size) {
-  scoped_array<uint8> buf(new uint8[size]);
+  int extra_bytes = 16;

[Ami GONE FROM CHROMIUM, 2012/01/27 23:44:58]

Commentary?

[acolwell GONE FROM CHROMIUM, 2012/01/29 03:00:41]

Changed to FF_INPUT_BUFFER_PADDING_SIZE & added a comment.

+  scoped_array<uint8> buf(new uint8[size + extra_bytes]);
   memcpy(buf.get(), data, size);
+  memset(buf.get() + size, 0, extra_bytes);
   return new DataBuffer(buf.Pass(), size);
 }
 
@@ -129,7 +131,7 @@ bool WebMClusterParser::OnSimpleBlock(int track_num, int timecode,
   if (!queue->empty() &&
       buffer->GetTimestamp() == queue->back()->GetTimestamp()) {
     DVLOG(1) << "Got SimpleBlock timecode is not strictly monotonically "
-            << "increasing for track " << track_num;
+             << "increasing for track " << track_num;
     return false;
   }