--- a/media/libstagefright/binding/H264.cpp
+++ b/media/libstagefright/binding/H264.cpp
@@ -957,17 +957,17 @@ H264::ExtractExtraData(const mozilla::Me
 H264::HasSPS(const mozilla::MediaByteBuffer* aExtraData)
 {
   return NumSPS(aExtraData) > 0;
 }
 
 /* static */ uint8_t
 H264::NumSPS(const mozilla::MediaByteBuffer* aExtraData)
 {
-  if (!aExtraData) {
+  if (!aExtraData || aExtraData->IsEmpty()) {
     return 0;
   }
 
   BufferReader reader(aExtraData);
   const uint8_t* ptr = reader.Read(5);
   auto res = reader.ReadU8();
   if (!ptr || res.isErr()) {
     return 0;