diff options
| author | Songyue Han <songyueh@google.com> | 2023-11-04 01:56:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-04 01:56:26 +0000 |
| commit | 7816b8efd5cbae118900cc686f6f7eaf0cf3a2ff (patch) | |
| tree | 147ab553f8ef35e6f83673bf7150409d73fb586b | |
| parent | 6bb47e3ff43a4c3de41b5b277b9190e5989f1778 (diff) | |
| parent | 9785c4e0d1185aed88c839c977131c7bfb44f4aa (diff) | |
| download | av-7816b8efd5cbae118900cc686f6f7eaf0cf3a2ff.tar.gz | |
Merge "Fix convertYUV420Planar16ToY410 overflow issue for unsupported cropwidth." into rvc-dev am: d049932011 am: e0085e750e am: fa4672af33 am: 1bb34ad7ac am: 8e5c4c1908 am: 2bd074e9b6 am: 9785c4e0d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/25096450
Change-Id: I6c45c8d7f1faf2ed0f2952d6dd9c513d4dcd2e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/libstagefright/colorconversion/ColorConverter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp index 4df79efea5..0db588d9ff 100644 --- a/media/libstagefright/colorconversion/ColorConverter.cpp +++ b/media/libstagefright/colorconversion/ColorConverter.cpp @@ -962,7 +962,8 @@ status_t ColorConverter::convertYUV420Planar16ToY410( uint32_t u01, v01, y01, y23, y45, y67, uv0, uv1; size_t x = 0; - for (; x < src.cropWidth() - 3; x += 4) { + // x % 4 is always 0 so x + 3 will never overflow. + for (; x + 3 < src.cropWidth(); x += 4) { u01 = *((uint32_t*)ptr_u); ptr_u += 2; v01 = *((uint32_t*)ptr_v); ptr_v += 2; |