Merge pull request #9239 from QuLogic/sanitizer-fixes

dopplershift · web-flow · commit 20aff4baac30 · 2017-09-27T20:41:23.000-06:00
Sanitizer fixes
diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp
@@ -137,7 +137,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
 
             offset = getULONG( ptr + 8 );
             length = getULONG( ptr + 12 );
-            table = (BYTE*)calloc( sizeof(BYTE), length );
+            table = (BYTE*)calloc( sizeof(BYTE), length + 2 );
 
             try
             {
@@ -160,6 +160,9 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
                 free(table);
                 throw;
             }
+            /* Always NUL-terminate; add two in case of UTF16 strings. */
+            table[length] = '\0';
+            table[length + 1] = '\0';
             return table;
         }
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -601,9 +601,7 @@ void FT2Font::set_text(
     FT_Bool use_kerning = FT_HAS_KERNING(face);
     FT_UInt previous = 0;
 
-    glyphs.resize(0);
-    pen.x = 0;
-    pen.y = 0;
+    clear();
 
     bbox.xMin = bbox.yMin = 32000;
     bbox.xMax = bbox.yMax = -32000;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ BYTE GetTable(struct TTFONT font, const char *name)`
`137`	`137`
`138`	`138`	`offset = getULONG( ptr + 8 );`
`139`	`139`	`length = getULONG( ptr + 12 );`
`140`		`- table = (BYTE*)calloc( sizeof(BYTE), length );`
	`140`	`+ table = (BYTE*)calloc( sizeof(BYTE), length + 2 );`
`141`	`141`
`142`	`142`	`try`
`143`	`143`	`{`
`@@ -160,6 +160,9 @@ BYTE GetTable(struct TTFONT font, const char *name)`
`160`	`160`	`free(table);`
`161`	`161`	`throw;`
`162`	`162`	`}`
	`163`	`+ /* Always NUL-terminate; add two in case of UTF16 strings. */`
	`164`	`+ table[length] = '\0';`
	`165`	`+ table[length + 1] = '\0';`
`163`	`166`	`return table;`
`164`	`167`	`}`
`165`	`168`