Update (old) harfbuzz to ToT

third_party/harfbuzz/src/harfbuzz-open.c

 /*
  * Copyright (C) 1998-2004  David Turner and Werner Lemberg
  * Copyright (C) 2006  Behdad Esfahbod
  *
  * This is part of HarfBuzz, an OpenType Layout engine library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
@@ skipping 1264 matching lines @@
 }
 
 
 
 /***************************
  * Device related functions
  ***************************/
 
 
 HB_INTERNAL HB_Error
-_HB_OPEN_Load_Device( HB_Device* d,
+_HB_OPEN_Load_Device( HB_Device** device,
                        HB_Stream    stream )
 {
+  HB_Device*  d;
   HB_Error   error;
 
   HB_UShort   n, count;
 
   HB_UShort*  dv;
 
 
   if ( ACCESS_Frame( 6L ) )
     return error;
 
+  if ( ALLOC( *device, sizeof(HB_Device)) )
+  {
+    *device = 0;
+    return error;
+  }
+
+  d = *device;
+
   d->StartSize   = GET_UShort();
   d->EndSize     = GET_UShort();
   d->DeltaFormat = GET_UShort();
 
   FORGET_Frame();
 
   d->DeltaValue = NULL;
 
   if ( d->StartSize > d->EndSize ||
        d->DeltaFormat == 0 || d->DeltaFormat > 3 )
     {
       /* XXX
        * I've seen fontforge generate DeltaFormat == 0.
        * Just return Ok and let the NULL DeltaValue disable
        * this table.
        */
       return HB_Err_Ok;
     }
 
   count = ( ( d->EndSize - d->StartSize + 1 ) >>
               ( 4 - d->DeltaFormat ) ) + 1;
 
   if ( ALLOC_ARRAY( d->DeltaValue, count, HB_UShort ) )
+  {
+    FREE( *device );
+    *device = 0;
     return error;
+  }
 
   if ( ACCESS_Frame( count * 2L ) )
   {
     FREE( d->DeltaValue );
+    FREE( *device );
+    *device = 0;
     return error;
   }
 
   dv = d->DeltaValue;
 
   for ( n = 0; n < count; n++ )
     dv[n] = GET_UShort();
 
   FORGET_Frame();
 
   return HB_Err_Ok;
 }
 
 
 HB_INTERNAL void
 _HB_OPEN_Free_Device( HB_Device* d )
 {
-  FREE( d->DeltaValue );
+  if ( d )
+  {
+    FREE( d->DeltaValue );
+    FREE( d );
+  }
 }
 
 
 /* Since we have the delta values stored in compressed form, we must
    uncompress it now.  To simplify the interface, the function always
    returns a meaningful value in `value'; the error is just for
    information.
                                |                |
    format = 1: 0011223344556677|8899101112131415|...
                                |                |
@@ skipping 23 matching lines @@
      11111111: (byte >> 0) & mask
      ....
 
      mask = 0x00FF                                    */
 
 HB_INTERNAL HB_Error
 _HB_OPEN_Get_Device( HB_Device* d,
                       HB_UShort    size,
                       HB_Short*    value )
 {
-  HB_UShort  byte, bits, mask, f, s;
+  HB_UShort  byte, bits, mask, s;
 
-
-  f = d->DeltaFormat;
-
-  if ( d->DeltaValue && size >= d->StartSize && size <= d->EndSize )
+  if ( d && d->DeltaValue && size >= d->StartSize && size <= d->EndSize )
   {
+    HB_UShort f = d->DeltaFormat;
     s    = size - d->StartSize;
     byte = d->DeltaValue[s >> ( 4 - f )];
     bits = byte >> ( 16 - ( ( s % ( 1 << ( 4 - f ) ) + 1 ) << f ) );
     mask = 0xFFFF >> ( 16 - ( 1 << f ) );
 
     *value = (HB_Short)( bits & mask );
 
     /* conversion to a signed value */
 
     if ( *value >= ( ( mask + 1 ) >> 1 ) )
       *value -= mask + 1;
 
     return HB_Err_Ok;
   }
   else
   {
     *value = 0;
     return HB_Err_Not_Covered;
   }
 }
 
 
 /* END */