diff options
| author | Bo Hu <bohu@google.com> | 2023-12-04 22:51:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-04 22:51:41 +0000 |
| commit | 488d9625681c03e1f39ee0f8f94cc3e1ff293928 (patch) | |
| tree | 793a313b277c509563ad6e78a80734680bc70538 | |
| parent | 85a4418f38a1a5c4f35312066fb1269fc1850006 (diff) | |
| parent | 581e17b86e035acb084cc26efafb69d650dfcaec (diff) | |
| download | goldfish-opengl-488d9625681c03e1f39ee0f8f94cc3e1ff293928.tar.gz | |
avc decoder: avoid access iterator after erase from map am: 6437903b7a am: 823a0375c0 am: 630d364295 am: c1d0d32416 am: df0fde4038 am: 581e17b86e
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25532835
Change-Id: I382b72d471de47471f1707c4db32f23a8d943439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp index 81366dd6..f9a7a3f5 100644 --- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp +++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp @@ -869,15 +869,15 @@ void C2GoldfishAvcDec::removePts(uint64_t pts) { if (!mOldPts2Index.empty()) { auto iter = mOldPts2Index.find(pts); if (iter != mOldPts2Index.end()) { - mOldPts2Index.erase(iter); index = iter->second; + mOldPts2Index.erase(iter); found = true; } } else { auto iter = mPts2Index.find(pts); if (iter != mPts2Index.end()) { - mPts2Index.erase(iter); index = iter->second; + mPts2Index.erase(iter); found = true; } } |