commit 3daf7a5c855b0640e2dd3904abe378e76a43829d
author arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> Wed Aug 10 20:06:32 2011 +0000
committer arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> Wed Aug 10 20:06:32 2011 +0000
tree cf3133b478f9569047efbb8a89e33259da43f154
parent db6755301647bc1ad0616d7e370138bc822b4b06

Fortify font build against error cases.



git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@43 672e30a5-4c29-85ac-ac6d-611c735e0a51

sfntly/font.cc

diff --git a/sfntly/font.cc b/sfntly/font.cc
index 814e2ee..32ecca7 100644
--- a/sfntly/font.cc
+++ b/sfntly/font.cc
@@ -387,6 +387,7 @@
     }
     if (table == NULL) {
 #if defined (SFNTLY_NO_EXCEPTION)
+      table_map->clear();
       return;
 #else
       std::string builder_string = "Unable to build table - ";

sfntly/font_data_table.cc

diff --git a/sfntly/font_data_table.cc b/sfntly/font_data_table.cc
index 1f9d1cc..e6d0984 100644
--- a/sfntly/font_data_table.cc
+++ b/sfntly/font_data_table.cc
@@ -89,6 +89,11 @@
     SubSerialize(new_data);
     data = new_data;
   }
+
+  if (data == NULL) {
+    return NULL;  // Do not build table with NULL data.
+  }
+
   FontDataTablePtr table = SubBuildTable(data);
   NotifyPostTableBuild(table);
   return table;