Merge "Camera: validate input in releaseRecordingFrame" into nyc-dev
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index 37f4c8f..1086340 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -479,6 +479,12 @@
void CameraClient::releaseRecordingFrame(const sp<IMemory>& mem) {
Mutex::Autolock lock(mLock);
if (checkPidAndHardware() != NO_ERROR) return;
+ if (mem == nullptr) {
+ android_errorWriteWithInfoLog(CameraService::SN_EVENT_LOG_ID, "26164272",
+ IPCThreadState::self()->getCallingUid(), nullptr, 0);
+ return;
+ }
+
mHardware->releaseRecordingFrame(mem);
}