Merge to XFA: Fix a couple potential file handle leaks in pdfium_test.

samples/pdfium_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 
@@ skipping 37 matching lines @@
   std::string scale_factor_as_string;
   std::string exe_path;
   std::string bin_directory;
 };
 
 // Reads the entire contents of a file into a newly malloc'd buffer.
 static char* GetFileContents(const char* filename, size_t* retlen) {
   FILE* file = fopen(filename, "rb");
   if (!file) {
     fprintf(stderr, "Failed to open: %s\n", filename);
-    return NULL;
+    return nullptr;
   }
-  (void) fseek(file, 0, SEEK_END);
+  (void)fseek(file, 0, SEEK_END);
   size_t file_length = ftell(file);
   if (!file_length) {
-    return NULL;
+    (void)fclose(file);
+    return nullptr;
   }
-  (void) fseek(file, 0, SEEK_SET);
-  char* buffer = (char*) malloc(file_length);
+  (void)fseek(file, 0, SEEK_SET);
+  char* buffer = static_cast<char*>(malloc(file_length));
   if (!buffer) {
-    return NULL;
+    (void)fclose(file);
+    return nullptr;
   }
   size_t bytes_read = fread(buffer, 1, file_length, file);
-  (void) fclose(file);
+  (void)fclose(file);
   if (bytes_read != file_length) {
     fprintf(stderr, "Failed to read: %s\n", filename);
     free(buffer);
-    return NULL;
+    return nullptr;
   }
   *retlen = bytes_read;
   return buffer;
 }
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
 // Returns the full path for an external V8 data file based on either
 // the currect exectuable path or an explicit override.
 static std::string GetFullPathForSnapshotFile(const Options& options,
                                               const std::string& filename) {
@@ skipping 102 matching lines @@
   if (!fp) {
     fprintf(stderr, "Failed to open %s for output\n", filename);
     return;
   }
 
   size_t bytes_written = fwrite(
       &png_encoding.front(), 1, png_encoding.size(), fp);
   if (bytes_written != png_encoding.size())
     fprintf(stderr, "Failed to write to  %s\n", filename);
 
-  (void) fclose(fp);
+  (void)fclose(fp);
 }
 
 #ifdef _WIN32
 static void WriteBmp(const char* pdf_name, int num, const void* buffer,
                      int stride, int width, int height) {
   if (!CheckDimensions(stride, width, height))
     return;
 
   int out_len = stride * height;
   if (out_len > INT_MAX / 3)
@@ skipping 25 matching lines @@
   fclose(fp);
 }
 
 void WriteEmf(FPDF_PAGE page, const char* pdf_name, int num) {
   int width = static_cast<int>(FPDF_GetPageWidth(page));
   int height = static_cast<int>(FPDF_GetPageHeight(page));
 
   char filename[256];
   snprintf(filename, sizeof(filename), "%s.%d.emf", pdf_name, num);
 
-  HDC dc = CreateEnhMetaFileA(NULL, filename, NULL, NULL);
+  HDC dc = CreateEnhMetaFileA(nullptr, filename, nullptr, nullptr);
 
   HRGN rgn = CreateRectRgn(0, 0, width, height);
   SelectClipRgn(dc, rgn);
   DeleteObject(rgn);
 
   SelectObject(dc, GetStockObject(NULL_PEN));
   SelectObject(dc, GetStockObject(WHITE_BRUSH));
   // If a PS_NULL pen is used, the dimensions of the rectangle are 1 pixel less.
   Rectangle(dc, 0, 0, width + 1, height + 1);
 
   FPDF_RenderPage(dc, page, 0, 0, width, height, 0,
                   FPDF_ANNOT | FPDF_PRINTING | FPDF_NO_CATCH);
 
   DeleteEnhMetaFile(CloseEnhMetaFile(dc));
 }
 #endif
 
 int ExampleAppAlert(IPDF_JSPLATFORM*, FPDF_WIDESTRING msg, FPDF_WIDESTRING,
                     int, int) {
   // Deal with differences between UTF16LE and wchar_t on this platform.
   size_t characters = 0;
   while (msg[characters]) {
     ++characters;
   }
   wchar_t* platform_string =
-      (wchar_t*)malloc((characters + 1) * sizeof(wchar_t));
+      static_cast<wchar_t*>(malloc((characters + 1) * sizeof(wchar_t)));
   for (size_t i = 0; i < characters + 1; ++i) {
     unsigned char* ptr = (unsigned char*)&msg[i];
     platform_string[i] = ptr[0] + 256 * ptr[1];
   }
   printf("Alert: %ls\n", platform_string);
   free(platform_string);
   return 0;
 }
 
 void ExampleDocGotoPage(IPDF_JSPLATFORM*, int pageNumber) {
@@ skipping 116 matching lines @@
   TestLoader(const char* pBuf, size_t len);
 
   const char* m_pBuf;
   size_t m_Len;
 };
 
 TestLoader::TestLoader(const char* pBuf, size_t len)
     : m_pBuf(pBuf), m_Len(len) {
 }
 
-int Get_Block(void* param, unsigned long pos, unsigned char* pBuf,
-              unsigned long size) {
-  TestLoader* pLoader = (TestLoader*) param;
+int GetBlock(void* param,
+             unsigned long pos,
+             unsigned char* pBuf,
+             unsigned long size) {
+  TestLoader* pLoader = static_cast<TestLoader*>(param);
   if (pos + size < pos || pos + size > pLoader->m_Len) return 0;
   memcpy(pBuf, pLoader->m_pBuf + pos, size);
   return 1;
 }
 
 FPDF_BOOL Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) {
   return true;
 }
 
 void Add_Segment(FX_DOWNLOADHINTS* pThis, size_t offset, size_t size) {
@@ skipping 12 matching lines @@
   FPDF_FORMFILLINFO form_callbacks;
   memset(&form_callbacks, '\0', sizeof(form_callbacks));
   form_callbacks.version = 2;
   form_callbacks.m_pJsPlatform = &platform_callbacks;
 
   TestLoader loader(pBuf, len);
 
   FPDF_FILEACCESS file_access;
   memset(&file_access, '\0', sizeof(file_access));
   file_access.m_FileLen = static_cast<unsigned long>(len);
-  file_access.m_GetBlock = Get_Block;
+  file_access.m_GetBlock = GetBlock;
   file_access.m_Param = &loader;
 
   FX_FILEAVAIL file_avail;
   memset(&file_avail, '\0', sizeof(file_avail));
   file_avail.version = 1;
   file_avail.IsDataAvail = Is_Data_Avail;
 
   FX_DOWNLOADHINTS hints;
   memset(&hints, '\0', sizeof(hints));
   hints.version = 1;
   hints.AddSegment = Add_Segment;
 
   FPDF_DOCUMENT doc;
   FPDF_AVAIL pdf_avail = FPDFAvail_Create(&file_avail, &file_access);
 
-  (void) FPDFAvail_IsDocAvail(pdf_avail, &hints);
+  (void)FPDFAvail_IsDocAvail(pdf_avail, &hints);
 
   if (!FPDFAvail_IsLinearized(pdf_avail)) {
     fprintf(stderr, "Non-linearized path...\n");
-    doc = FPDF_LoadCustomDocument(&file_access, NULL);
+    doc = FPDF_LoadCustomDocument(&file_access, nullptr);
   } else {
     fprintf(stderr, "Linearized path...\n");
-    doc = FPDFAvail_GetDocument(pdf_avail, NULL);
+    doc = FPDFAvail_GetDocument(pdf_avail, nullptr);
   }
 
-  if (!doc)
-  {
+  if (!doc) {

[Lei Zhang, 2015/09/23 21:48:28]

We conflicted here. This looks reasonable so I'll merge this back to master in a
separate CL?

[Tom Sepez, 2015/09/23 21:52:12]

Acknowledged.

     fprintf(stderr, "Load pdf docs unsuccessful.\n");
     return;
   }
 
-  (void) FPDF_GetDocPermissions(doc);
-  (void) FPDFAvail_IsFormAvail(pdf_avail, &hints);
+  (void)FPDF_GetDocPermissions(doc);
+  (void)FPDFAvail_IsFormAvail(pdf_avail, &hints);
 
   FPDF_FORMHANDLE form = FPDFDOC_InitFormFillEnvironment(doc, &form_callbacks);
   int docType = DOCTYPE_PDF;
   if (FPDF_HasXFAField(doc, &docType))
   {
       if (docType != DOCTYPE_PDF && !FPDF_LoadXFA(doc))
           fprintf(stderr, "LoadXFA unsuccessful, continuing anyway.\n");
   }
   FPDF_SetFormFieldHighlightColor(form, 0, 0xFFE4DD);
   FPDF_SetFormFieldHighlightAlpha(form, 100);
 
   int first_page = FPDFAvail_GetFirstPageNum(doc);
-  (void) FPDFAvail_IsPageAvail(pdf_avail, first_page, &hints);
+  (void)FPDFAvail_IsPageAvail(pdf_avail, first_page, &hints);
 
   int page_count = FPDF_GetPageCount(doc);
   for (int i = 0; i < page_count; ++i) {
-    (void) FPDFAvail_IsPageAvail(pdf_avail, i, &hints);
+    (void)FPDFAvail_IsPageAvail(pdf_avail, i, &hints);
   }
 
   FORM_DoDocumentJSAction(form);
   FORM_DoDocumentOpenAction(form);
 
   int rendered_pages = 0;
   int bad_pages = 0;
   for (int i = 0; i < page_count; ++i) {
     FPDF_PAGE page = FPDF_LoadPage(doc, i);
     if (!page) {
-        bad_pages ++;
-        continue;
+      ++bad_pages;
+      continue;
     }
     FPDF_TEXTPAGE text_page = FPDFText_LoadPage(page);
     FORM_OnAfterLoadPage(page, form);
     FORM_DoPageAAction(page, form, FPDFPAGE_AACTION_OPEN);
 
     double scale = 1.0;
     if (!options.scale_factor_as_string.empty()) {
       std::stringstream(options.scale_factor_as_string) >> scale;
     }
     int width = static_cast<int>(FPDF_GetPageWidth(page) * scale);
     int height = static_cast<int>(FPDF_GetPageHeight(page) * scale);
 
     FPDF_BITMAP bitmap = FPDFBitmap_Create(width, height, 0);
     if (!bitmap) {
       fprintf(stderr, "Page was too large to be rendered.\n");
       bad_pages++;
       continue;
     }
 
     FPDFBitmap_FillRect(bitmap, 0, 0, width, height, 0xFFFFFFFF);
     FPDF_RenderPageBitmap(bitmap, page, 0, 0, width, height, 0, 0);
-    rendered_pages ++;
+    ++rendered_pages;
 
     FPDF_FFLDraw(form, bitmap, page, 0, 0, width, height, 0, 0);
     int stride = FPDFBitmap_GetStride(bitmap);
     const char* buffer =
         reinterpret_cast<const char*>(FPDFBitmap_GetBuffer(bitmap));
 
     switch (options.output_format) {
 #ifdef _WIN32
       case OUTPUT_BMP:
         WriteBmp(name.c_str(), i, buffer, stride, width, height);
@@ skipping 92 matching lines @@
     RenderPdf(filename, file_contents, file_length, options);
     free(file_contents);
   }
 
   FPDF_DestroyLibrary();
   v8::V8::ShutdownPlatform();
   delete platform;
 
   return 0;
 }