diff options
| author | Bo Hu <bohu@google.com> | 2023-12-04 21:39:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-04 21:39:43 +0000 |
| commit | df0fde4038e05d1f659960b5b04f2ebe187f80a1 (patch) | |
| tree | 6512854efcd1a580ae384d79176b5fd1456a4ef9 | |
| parent | a333f9216ca7bf79cc44a40f9c29df50d89f9c5b (diff) | |
| parent | c1d0d32416d3cb06ae53998e8a5a8bccbbf8df54 (diff) | |
| download | goldfish-opengl-df0fde4038e05d1f659960b5b04f2ebe187f80a1.tar.gz | |
avc decoder: avoid access iterator after erase from map am: 6437903b7a am: 823a0375c0 am: 630d364295 am: c1d0d32416
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25532835
Change-Id: If4080bc7b27f932e1c6347139f94f76f092b4073
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 cbc70690..3a25f7a7 100644 --- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp +++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp @@ -860,15 +860,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; } } |