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

core/src/fpdfdoc/doc_formcontrol.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
@@ skipping 46 matching lines @@
   for (const auto& it : *pAP) {
     CPDF_Object* pObj1 = it.second;
     if (!pObj1) {
       continue;
     }
     CPDF_Object* pObjDirect1 = pObj1->GetDirect();
     CPDF_Dictionary* pSubDict = pObjDirect1->AsDictionary();
     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;
       }
       if (csKey2 != "Off") {
         pSubDict->ReplaceKey(csKey2, csValue);
         break;
       }
     }
   }
 }
@@ skipping 334 matching lines @@
   return m_pDict ? m_pDict->GetStream(csEntry) : nullptr;
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
   return m_pDict ? m_pDict->GetDict("IF") : nullptr;
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetInteger("TP", TEXTPOS_CAPTION) : TEXTPOS_CAPTION;
 }