| commit | d9182331e1e9f16972684a6cac901821a86114ca | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat Jan 13 08:41:50 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 13 08:41:50 2024 +0000 |
| tree | d808d1b0ad2ee10acb5756731f81e254757e549d | |
| parent | b160523a3152fcdb2ab356f05fca532409d44583 [diff] | |
| parent | 0d238df741687e4205546a0b682e5d69e0514f40 [diff] |
Merge "SurfaceUtils: ensure lock() grants a valid pointer" into main am: 0d238df741 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2874840 Change-Id: Ie088353dff3940dafd1de49956be56e8db860796 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp index f16e635..604dcb0 100644 --- a/media/libstagefright/SurfaceUtils.cpp +++ b/media/libstagefright/SurfaceUtils.cpp
@@ -298,6 +298,11 @@ ALOGE("error pushing blank frames: lock failed: %s (%d)", strerror(-err), -err); break; } + if (img == nullptr) { + (void)buf->unlock(); // Since lock() was successful. + ALOGE("error pushing blank frames: lock succeeded: buf mapping is nullptr"); + break; + } *img = 0;