shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[type42] Avoid some memory zeroing.

* src/type42/t42objs.c (T42_Open_Face): Tweak allocation macro.
* src/type42/t42parse.c (t42_parse_sfnts): Ditto.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2021-05-20  Alexei Podtelezhnikov  <apodtele@gmail.com>

+

+	[type42] Avoid some memory zeroing.

+

+	* src/type42/t42objs.c (T42_Open_Face): Tweak allocation macro.

+	* src/type42/t42parse.c (t42_parse_sfnts): Ditto.

+

 2021-05-19  Nikolaus Waxweiler  <madigens@gmail.com>

 	[CMake] Update dependency finders.

--- a/src/type42/t42objs.c

+++ b/src/type42/t42objs.c

@@ -44,7 +44,7 @@

     parser = &loader.parser;

-    if ( FT_ALLOC( face->ttf_data, 12 ) )

+    if ( FT_QALLOC( face->ttf_data, 12 ) )

       goto Exit;

     /* while parsing the font we always update `face->ttf_size' so that */

--- a/src/type42/t42parse.c

+++ b/src/type42/t42parse.c

@@ -614,7 +614,7 @@

           error = FT_THROW( Invalid_File_Format );

           goto Fail;

         }

-        if ( FT_REALLOC( string_buf, old_string_size, string_size ) )

+        if ( FT_QREALLOC( string_buf, old_string_size, string_size ) )

           goto Fail;

         allocated = 1;

@@ -718,7 +718,7 @@

               goto Fail;

             }

-            if ( FT_REALLOC( face->ttf_data, 12, face->ttf_size ) )

+            if ( FT_QREALLOC( face->ttf_data, 12, face->ttf_size ) )

               goto Fail;

           }

           /* fall through */

@@ -767,8 +767,8 @@

             FT_TRACE2(( "  allocating %ld bytes\n", face->ttf_size + 1 ));

             FT_TRACE2(( "\n" ));

-            if ( FT_REALLOC( face->ttf_data, 12 + 16 * num_tables,

-                             face->ttf_size + 1 ) )

+            if ( FT_QREALLOC( face->ttf_data, 12 + 16 * num_tables,

+                              face->ttf_size + 1 ) )

               goto Fail;

           }

           /* fall through */