commit 2c9cba136544dd305f5e83a120d4222d9a2b6c62
author Oliver Chang <ochang@chromium.org> Wed Jan 13 21:57:47 2016 -0800
committer Oliver Chang <ochang@chromium.org> Wed Jan 13 21:57:47 2016 -0800
tree 8f9e758e2b59be83d140a5d9978f3bb7ccb986f5
parent f2663fecb894d447dfc9b4b04b4477eca5b557b7

Merge to XFA: Fix another invalidated iterator issue while traversing CPDF_Dictionary.

TBR=thestig@chromium.org

(cherry picked from commit a626e39700abe56e98bc44a97c38eb8da077065e)

Review URL: https://codereview.chromium.org/1587723004 .

core/src/fpdfdoc/doc_formcontrol.cpp

diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp
index 6c3d1ec..bf37d85 100644
--- a/core/src/fpdfdoc/doc_formcontrol.cpp
+++ b/core/src/fpdfdoc/doc_formcontrol.cpp
@@ -64,9 +64,11 @@
     if (!pSubDict)
       continue;
 
-    for (const auto& subdict_it : *pSubDict) {
-      const CFX_ByteString& csKey2 = subdict_it.first;
-      CPDF_Object* pObj2 = subdict_it.second;
+    auto subdict_it = pSubDict->begin();
+    while (subdict_it != pSubDict->end()) {
+      const CFX_ByteString& csKey2 = subdict_it->first;
+      CPDF_Object* pObj2 = subdict_it->second;
+      ++subdict_it;
       if (!pObj2) {
         continue;
       }