Catch nullptr possibilities in NuMediaExtractor
Detect and gracefully fail some missed cases where a null pointer can
occur in the MediaExtractor code.
Bug: 277614674
Test: CtsMediaExtractorTestCases w/debug messages
Change-Id: I59dd611c74653e60c7066fb9af5a1afb60d1cbe3
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index d736734..28ca9ff 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -298,6 +298,9 @@
size_t psshsize;
if (meta->findData(kKeyPssh, &type, &pssh, &psshsize)) {
sp<ABuffer> buf = new ABuffer(psshsize);
+ if (buf->data() == nullptr) {
+ return -ENOMEM;
+ }
memcpy(buf->data(), pssh, psshsize);
(*format)->setBuffer("pssh", buf);
}
@@ -308,6 +311,9 @@
if (meta->findData(kKeySlowMotionMarkers, &type, &slomoMarkers, &slomoMarkersSize)
&& slomoMarkersSize > 0) {
sp<ABuffer> buf = new ABuffer(slomoMarkersSize);
+ if (buf->data() == nullptr) {
+ return -ENOMEM;
+ }
memcpy(buf->data(), slomoMarkers, slomoMarkersSize);
(*format)->setBuffer("slow-motion-markers", buf);
}
@@ -639,6 +645,7 @@
numPageSamples = -1;
}
+ // caller has verified there is sufficient space
// insert, including accounting for the space used.
memcpy((uint8_t *)buffer->data() + mbuf->range_length(),
&numPageSamples,