Remove default argument from CPDF_Dictionary::SetAt().

core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.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 "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "pageint.h"
@@ skipping 59 matching lines @@
         m_pSyntax->SetPos(savePos);
         pDict->Release();
         return;
       }
     }
     if (type != CPDF_StreamParser::Name) {
       break;
     }
     CFX_ByteString key((const FX_CHAR*)m_pSyntax->GetWordBuf() + 1,
                        m_pSyntax->GetWordSize() - 1);
-    CPDF_Object* pObj = m_pSyntax->ReadNextObject();
+    nonstd::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>> pObj(
+        m_pSyntax->ReadNextObject());
     if (!key.IsEmpty()) {
-      pDict->SetAt(key, pObj, m_pDocument);
-    } else if (pObj) {
-      pObj->Release();
+      FX_DWORD dwObjNum = pObj->GetObjNum();
+      if (dwObjNum)
+        pDict->SetAtReference(key, m_pDocument, dwObjNum);
+      else
+        pDict->SetAt(key, pObj.release());
     }
   }
   _PDF_ReplaceAbbr(pDict);
   CPDF_Object* pCSObj = NULL;
   if (pDict->KeyExist(FX_BSTRC("ColorSpace"))) {
     pCSObj = pDict->GetElementValue(FX_BSTRC("ColorSpace"));
     if (pCSObj->IsName()) {
       CFX_ByteString name = pCSObj->GetString();
       if (name != FX_BSTRC("DeviceRGB") && name != FX_BSTRC("DeviceGray") &&
           name != FX_BSTRC("DeviceCMYK")) {
         pCSObj = FindResourceObj(FX_BSTRC("ColorSpace"), name);
         if (pCSObj && !pCSObj->GetObjNum()) {

[Lei Zhang, 2015/10/26 21:58:22]

Since there's no object number, I would expect the clone to also have no object
number. Thus this should have been the simpler version of SetAt() all along.

I can't say anything about the lifetime of |pCSObj| other than it remains the
same as before.

[Tom Sepez, 2015/10/26 22:14:00]

Acknowledged.

           pCSObj = pCSObj->Clone();
-          pDict->SetAt(FX_BSTRC("ColorSpace"), pCSObj, m_pDocument);
+          pDict->SetAt(FX_BSTRC("ColorSpace"), pCSObj);
         }
       }
     }
   }
   CPDF_Stream* pStream = m_pSyntax->ReadInlineStream(
       m_pDocument, pDict, pCSObj, m_Options.m_bDecodeInlineImage);
   while (1) {
     CPDF_StreamParser::SyntaxType type = m_pSyntax->ParseNextElement();
     if (type == CPDF_StreamParser::EndOfData) {
       break;
@@ skipping 1032 matching lines @@
       }
       m_Status = Done;
       return;
     }
     steps++;
     if (pPause && pPause->NeedToPauseNow()) {
       break;
     }
   }
 }