Fix bug in CPDF_PageContentGenerate constructor and destructor

core/src/fpdfapi/fpdf_edit/fpdf_edit_content.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_serial.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../fpdf_page/pageint.h"
 CFX_ByteTextBuf& operator << (CFX_ByteTextBuf& ar, CFX_AffineMatrix& matrix)
 {
     ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " " << matrix.e << " " << matrix.f;
     return ar;
 }
 CPDF_PageContentGenerate::CPDF_PageContentGenerate(CPDF_Page* pPage) : m_pPage(pPage)
 {
     m_pDocument = NULL;
     if (m_pPage) {
         m_pDocument = m_pPage->m_pDocument;
     }
+    FX_POSITION pos = pPage->GetFirstObjectPosition();
+    while (pos) {
+        if (CPDF_PageObject* pPageObj = pPage->GetNextObject(pos)) {

[Lei Zhang, 2014/08/20 00:04:22]

Do you need the if statement? InsertPageObject() checks to see if |pPageObj| is
NULL.

[Bo Xu, 2014/08/20 00:16:57]

Right, it's not needed.

+            InsertPageObject(pPageObj);
+        }
+    }
+
 }
 CPDF_PageContentGenerate::~CPDF_PageContentGenerate()
 {
-    for (int i = 0; i < m_pageObjects.GetSize(); ++i) {
-        CPDF_PageObject* pPageObj = (CPDF_PageObject*)m_pageObjects[i];
-        if (pPageObj) {
-            pPageObj->Release();
-        }
-    }
 }
 FX_BOOL CPDF_PageContentGenerate::InsertPageObject(CPDF_PageObject* pPageObject)
 {
     if (!pPageObject) {
         return FALSE;
     }
     return m_pageObjects.Add(pPageObject);
 }
 void CPDF_PageContentGenerate::GenerateContent()
 {
@@ skipping 115 matching lines @@
     } else if (type == PDFOBJ_STREAM) {
         CPDF_StreamAcc contentStream;
         contentStream.LoadAllData((CPDF_Stream*)pContent);
         ProcessForm(buf, contentStream.GetData(), contentStream.GetSize(), matrix);
     }
     CPDF_Stream* pStream = FX_NEW CPDF_Stream(NULL, 0, NULL);
     pStream->SetData(buf.GetBuffer(), buf.GetLength(), FALSE, FALSE);
     m_pDocument->AddIndirectObject(pStream);
     m_pPage->m_pFormDict->SetAtReference("Contents", m_pDocument, pStream->GetObjNum());
 }