commit c3b42aab83df213d3efa3de0b95a222e3639aa78
author Hui Su <huisu@google.com> Mon Mar 12 10:20:39 2018 -0700
committer Hui Su <huisu@google.com> Mon Mar 12 21:57:39 2018 +0000
tree e66e8f0698d2b2d5dc46f291cd08c1cf5af435c4
parent 7b67ff392ec244e7d43fa166982ea993a7ff4258

Allow decoder to tolerate invalid metadata size

BUG=b/74496110

Change-Id: I9cb51685ae11219f0c5a210921b4fb9223069858

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 2ab5d35..efb2ab4 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -276,7 +276,7 @@
 #endif
 
 static size_t read_metadata(const uint8_t *data, size_t sz) {
-  assert(sz >= 2);
+  if (sz < 2) return sz;  // Invalid data size.
   const OBU_METADATA_TYPE metadata_type = (OBU_METADATA_TYPE)mem_get_le16(data);
 
   if (metadata_type == OBU_METADATA_TYPE_PRIVATE_DATA) {