src/java.desktop/share/native/libfreetype/src/psaux/psft.c

*** 383,393 ****
        FT_ASSERT( charstring_base + charstring_len >= charstring_base );
  
        FT_ZERO( &buf );
        buf.start =
        buf.ptr   = charstring_base;
!       buf.end   = charstring_base + charstring_len;
  
        FT_ZERO( &transform );
  
        cf2_getScaleAndHintFlag( decoder,
                                 &transform.a,
--- 383,393 ----
        FT_ASSERT( charstring_base + charstring_len >= charstring_base );
  
        FT_ZERO( &buf );
        buf.start =
        buf.ptr   = charstring_base;
!       buf.end   = FT_OFFSET( charstring_base, charstring_len );
  
        FT_ZERO( &transform );
  
        cf2_getScaleAndHintFlag( decoder,
                                 &transform.a,
*** 695,705 ****
  
      /* assume input has been validated */
      FT_ASSERT( charstring + len >= charstring );
  
      buf->start = charstring;
!     buf->end   = charstring + len;
      buf->ptr   = buf->start;
  
      return FT_Err_Ok;
    }
  
--- 695,705 ----
  
      /* assume input has been validated */
      FT_ASSERT( charstring + len >= charstring );
  
      buf->start = charstring;
!     buf->end   = FT_OFFSET( charstring, len );
      buf->ptr   = buf->start;
  
      return FT_Err_Ok;
    }
  
*** 818,828 ****
      {
        /* The Type 1 driver stores subroutines without the seed bytes. */
        /* The CID driver stores subroutines with seed bytes.  This     */
        /* case is taken care of when decoder->subrs_len == 0.          */
        if ( decoder->locals_len )
!         buf->end = buf->start + decoder->locals_len[idx];
        else
        {
          /* We are using subroutines from a CID font.  We must adjust */
          /* for the seed bytes.                                       */
          buf->start += ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );
--- 818,828 ----
      {
        /* The Type 1 driver stores subroutines without the seed bytes. */
        /* The CID driver stores subroutines with seed bytes.  This     */
        /* case is taken care of when decoder->subrs_len == 0.          */
        if ( decoder->locals_len )
!         buf->end = FT_OFFSET( buf->start, decoder->locals_len[idx] );
        else
        {
          /* We are using subroutines from a CID font.  We must adjust */
          /* for the seed bytes.                                       */
          buf->start += ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );