From 6437903b7a4ced12307f59446ee0248a383a74f5 Mon Sep 17 00:00:00 2001 From: Bo Hu Date: Fri, 1 Dec 2023 15:25:46 -0800 Subject: avc decoder: avoid access iterator after erase from map Bug: 241232433 Change-Id: I081758794c5406e566eec33f42d97e88e8521f61 --- system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp index 6c57922e..988a35cf 100644 --- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp +++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp @@ -803,15 +803,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; } } -- cgit v1.2.3 From 1c89a33efbe94f209cc42a086ba7da6f003a481a Mon Sep 17 00:00:00 2001 From: Bo Hu Date: Fri, 1 Dec 2023 15:29:22 -0800 Subject: hevc decoder: avoid access iterator after erase from map Bug: 241232433 Change-Id: Ib11fc6b8092450a32fa5b687bd0f16d7564f8152 --- system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp index 13e9515d..adf6ce78 100644 --- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp +++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp @@ -809,15 +809,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; } } -- cgit v1.2.3