Destroy library before deleting g_font_info in ShutdownSDK()

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 301 matching lines @@
   0,
   0,
   DeleteFont
 };
 #else
 struct FPDF_SYSFONTINFO_WITHMETRICS : public FPDF_SYSFONTINFO {
   explicit FPDF_SYSFONTINFO_WITHMETRICS(FPDF_SYSFONTINFO* sysfontinfo) {
     version = sysfontinfo->version;
     default_sysfontinfo = sysfontinfo;
   }
 

[Tom Sepez, 2016/11/10 17:47:08]

Probably cleaner to call FPDF_FreeDefaultSystemFontInfo() in this dtor and have
it clean up after itself rather than doing from the outside at 657

-  ~FPDF_SYSFONTINFO_WITHMETRICS() { delete default_sysfontinfo; }
+  ~FPDF_SYSFONTINFO_WITHMETRICS() {}
 
+  // Not owned.

[Tom Sepez, 2016/11/10 17:47:08]

nit: in which case this comment goes away.

   FPDF_SYSFONTINFO* default_sysfontinfo;
 };
 
 FPDF_SYSFONTINFO_WITHMETRICS* g_font_info = nullptr;
 
 void* MapFontWithMetrics(FPDF_SYSFONTINFO* sysfontinfo,
                          int weight,
                          int italic,
                          int charset,
                          int pitch_family,
@@ skipping 309 matching lines @@
   g_font_info->DeleteFont = DeleteFont;
   FPDF_SetSystemFontInfo(g_font_info);
 #endif
 
   FSDK_SetUnSpObjProcessHandler(&g_unsupported_info);
 
   return true;
 }
 
 void ShutdownSDK() {
+  FPDF_DestroyLibrary();
 #if !defined(OS_LINUX)
   FPDF_FreeDefaultSystemFontInfo(g_font_info->default_sysfontinfo);
   delete g_font_info;
 #endif
-  FPDF_DestroyLibrary();
   TearDownV8();
 }
 
 PDFEngine* PDFEngine::Create(PDFEngine::Client* client) {
   return new PDFiumEngine(client);
 }
 
 PDFiumEngine::PDFiumEngine(PDFEngine::Client* client)
     : client_(client),
       current_zoom_(1.0),
@@ skipping 3484 matching lines @@
   FPDF_DOCUMENT doc =
       FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, nullptr);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf