diff options
| author | Bo Hu <bohu@google.com> | 2023-12-04 21:47:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-04 21:47:15 +0000 |
| commit | e4634e36b0ac1d45a39f0093ab09f5933afef5ee (patch) | |
| tree | 22fb0d944fe916b6ed014402779265c7b5dc5ae8 | |
| parent | e72c97e1945b1de1385c17a351b2d2fdc00b61dc (diff) | |
| parent | 15db1b75a498b2e8f5dd37d4310b6c08b94482b6 (diff) | |
| download | goldfish-opengl-e4634e36b0ac1d45a39f0093ab09f5933afef5ee.tar.gz | |
hevc decoder: avoid access iterator after erase from map am: 1c89a33efb am: a333f9216c am: 7abc6bb628 am: 15db1b75a4
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25532478
Change-Id: I90217b20dbf724ed5803b671231ca2473e3886e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp index 14eed1f6..173dd386 100644 --- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp +++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp @@ -816,15 +816,15 @@ void C2GoldfishHevcDec::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; } } |