Roll PDFium

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 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 "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 #include "ppapi/cpp/private/pdf.h"
 #include "ppapi/cpp/trusted/browser_font_trusted.h"
 #include "ppapi/cpp/url_response_info.h"
 #include "ppapi/cpp/var.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_ext.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_flatten.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_searchex.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_sysfontinfo.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdf_transformpage.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdfedit.h"
-#include "third_party/pdfium/fpdfsdk/include/fpdfoom.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdfppo.h"
 #include "third_party/pdfium/fpdfsdk/include/fpdfsave.h"
 #include "third_party/pdfium/fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "third_party/pdfium/fpdfsdk/include/pdfwindow/PWL_FontMap.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace chrome_pdf {
 
 namespace {
 
@@ skipping 233 matching lines @@
   EnumFonts,
   MapFont,
   0,
   GetFontData,
   0,
   0,
   DeleteFont
 };
 #endif  // defined(OS_LINUX)
 
-void OOM_Handler(_OOM_INFO*) {
-  // Kill the process.  This is important for security, since the code doesn't
-  // NULL-check many memory allocations.  If a malloc fails, returns NULL, and
-  // the buffer is then used, it provides a handy mapping of memory starting at
-  // address 0 for an attacker to utilize.
-  abort();
-}
-
-OOM_INFO g_oom_info = {
-  1,
-  OOM_Handler
-};
-
 PDFiumEngine* g_engine_for_unsupported;
 
 void Unsupported_Handler(UNSUPPORT_INFO*, int type) {
   if (!g_engine_for_unsupported) {
     NOTREACHED();
     return;
   }
 
   g_engine_for_unsupported->UnsupportedFeature(type);
 }
@@ skipping 206 matching lines @@
   base::ReplaceChars(*text, kCr, kBlank, text);
 #elif defined(OS_WIN)
   // Do nothing
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 }  // namespace
 
-bool InitializeSDK(void* data) {
-  FPDF_InitLibrary(data);
+bool InitializeSDK() {
+  FPDF_InitLibrary();
 
 #if defined(OS_LINUX)
   // Font loading doesn't work in the renderer sandbox in Linux.
   FPDF_SetSystemFontInfo(&g_font_info);
 #endif
 
-  FSDK_SetOOMHandler(&g_oom_info);
   FSDK_SetUnSpObjProcessHandler(&g_unsuppored_info);
 
   return true;
 }
 
 void ShutdownSDK() {
   FPDF_DestroyLibrary();
 }
 
 PDFEngine* PDFEngine::Create(PDFEngine::Client* client) {
@@ skipping 3345 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf