[Git][freetype/freetype][master] 2 commits: [cache] Revert to some zeroi

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

9a4c846e

by Alexei Podtelezhnikov at 2021-09-14T21:25:47-04:00

[cache] Revert to some zeroing.

* src/cache/ftccache.c (ftc_cache_init, ftc_cache_resize): Zero
`buckets` again to fix some crashes.

49270c17

by Alexei Podtelezhnikov at 2021-09-14T21:32:43-04:00

Replace boolean allocation macros with MEM ones.

* src/base/ftbitmap.c (FT_Bitmap_Copy): Use MEM-macro.
* src/base/ftobjs.c (ft_glyphslot_alloc_bitmap): Ditto.
* src/bzip2/ftbzip2.c (ft_bzip2_alloc): Ditto.
* src/cache/ftccache.c (ftc_cache_init): Ditto
* src/gzip/ftgzip.c (ft_gzip_alloc): Ditto.
* src/psnames/psmodule.c (ps_unicodes_init): Ditto.
* src/sfnt/sfobjs.c (sfnt_load_face): Ditto.
* src/sfnt/ttload.c (tt_face_load_name): Ditto.

8 changed files:

src/base/ftbitmap.c
src/base/ftobjs.c
src/bzip2/ftbzip2.c
src/cache/ftccache.c
src/gzip/ftgzip.c
src/psnames/psmodule.c
src/sfnt/sfobjs.c
src/sfnt/ttload.c

Changes:

src/base/ftbitmap.c

@@ -112,10 +112,10 @@
        target_size = (FT_ULong)target_pitch * target->rows;
        if ( target_size != size )
 -        (void)FT_QREALLOC( target->buffer, target_size, size );
 +        FT_MEM_QREALLOC( target->buffer, target_size, size );
+     }
      else
 -      (void)FT_QALLOC( target->buffer, size );
 +      FT_MEM_QALLOC( target->buffer, size );
      if ( !error )
+     {

src/base/ftobjs.c

@@ -535,7 +535,7 @@
      else
        slot->internal->flags |= FT_GLYPH_OWN_BITMAP;
 -    (void)FT_ALLOC( slot->bitmap.buffer, size );
 +    FT_MEM_ALLOC( slot->bitmap.buffer, size );
      return error;
+   }

src/bzip2/ftbzip2.c

@@ -70,7 +70,7 @@
      FT_Pointer  p  = NULL;
 -    (void)FT_QALLOC( p, sz );
 +    FT_MEM_QALLOC( p, sz );
      return p;
+   }

src/cache/ftccache.c

@@ -119,7 +119,7 @@
        FT_UFast  count = mask + p + 1;    /* number of buckets */
 -      /* do we need to shrink the buckets array? */
 +      /* do we need to expand the buckets array? */
        if ( cache->slack < 0 )
+       {
          FTC_Node  new_list = NULL;
@@ -135,7 +135,7 @@
            /* if we can't expand the array, leave immediately */
 -          if ( FT_QRENEW_ARRAY( cache->buckets,
 +          if ( FT_RENEW_ARRAY( cache->buckets,
                                 ( mask + 1 ) * 2, ( mask + 1 ) * 4 ) )
              break;
+         }
@@ -172,7 +172,7 @@
            cache->p = p + 1;
+       }
 -      /* do we need to expand the buckets array? */
 +      /* do we need to shrink the buckets array? */
        else if ( cache->slack > (FT_Long)count * FTC_HASH_SUB_LOAD )
+       {
          FT_UFast   old_index = p + mask;
@@ -341,7 +341,7 @@
      cache->mask  = FTC_HASH_INITIAL_SIZE - 1;
      cache->slack = FTC_HASH_INITIAL_SIZE * FTC_HASH_MAX_LOAD;
 -    (void)FT_QNEW_ARRAY( cache->buckets, FTC_HASH_INITIAL_SIZE * 2 );
 +    FT_MEM_NEW_ARRAY( cache->buckets, FTC_HASH_INITIAL_SIZE * 2 );
      return error;
+   }

src/gzip/ftgzip.c

@@ -132,7 +132,7 @@
      /* allocate and zero out */
 -    (void)FT_ALLOC( p, sz );
 +    FT_MEM_ALLOC( p, sz );
      return p;
+   }

src/psnames/psmodule.c

@@ -389,9 +389,9 @@
          /* Reallocate if the number of used entries is much smaller. */
          if ( count < num_glyphs / 2 )
+         {
 -          (void)FT_QRENEW_ARRAY( table->maps,
 -                                 num_glyphs + EXTRA_GLYPH_LIST_SIZE,
 -                                 count );
 +          FT_MEM_QRENEW_ARRAY( table->maps,
 +                               num_glyphs + EXTRA_GLYPH_LIST_SIZE,
 +                               count );
            error = FT_Err_Ok;
+         }

src/sfnt/sfobjs.c

@@ -1238,7 +1238,7 @@
+           }
            /* reduce array size to the actually used elements */
 -          (void)FT_QRENEW_ARRAY( sbit_strike_map, count, bsize_idx );
 +          FT_MEM_QRENEW_ARRAY( sbit_strike_map, count, bsize_idx );
            /* from now on, all strike indices are mapped */
            /* using `sbit_strike_map'                    */

src/sfnt/ttload.c

@@ -993,9 +993,9 @@
        /* reduce array size to the actually used elements */
        count = (FT_UInt)( entry - table->names );
 -      (void)FT_QRENEW_ARRAY( table->names,
 -                             table->numNameRecords,
 -                             count );
 +      FT_MEM_QRENEW_ARRAY( table->names,
 +                           table->numNameRecords,
 +                           count );
        table->numNameRecords = count;
+     }

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] 2 commits: [cache] Revert to some zeroing.
Date:	Wed, 15 Sep 2021 01:39:28 +0000