[Git][freetype/freetype][master] * src/base/ftobjs.c (Mac_Read_sfnt_Resource): Reduce casting.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• 480be443
  by Alexei Podtelezhnikov at 2022-08-01T22:59:58-04:00

  * src/base/ftobjs.c (Mac_Read_sfnt_Resource): Reduce casting.
  

1 changed file:

• src/base/ftobjs.c

Changes:

src/base/ftobjs.c

---

...	...	@@ -2177,7 +2177,7 @@
2177	2177	FT_Byte* sfnt_data = NULL;
2178	2178	FT_Error error;
2179	2179	FT_ULong flag_offset;
2180		- FT_Long rlen;
	2180	+ FT_ULong rlen;
2181	2181	int is_cff;
2182	2182	FT_Long face_index_in_resource = 0;
2183	2183
...	...	@@ -2192,11 +2192,11 @@
2192	2192	if ( error )
2193	2193	goto Exit;
2194	2194
2195		- if ( FT_READ_LONG( rlen ) )
	2195	+ if ( FT_READ_ULONG( rlen ) )
2196	2196	goto Exit;
2197		- if ( rlen < 1 )
	2197	+ if ( !rlen )
2198	2198	return FT_THROW( Cannot_Open_Resource );
2199		- if ( (FT_ULong)rlen > FT_MAC_RFORK_MAX_LEN )
	2199	+ if ( rlen > FT_MAC_RFORK_MAX_LEN )
2200	2200	return FT_THROW( Invalid_Offset );
2201	2201
2202	2202	error = open_face_PS_from_sfnt_stream( library,
...	...	@@ -2214,7 +2214,7 @@
2214	2214
2215	2215	if ( FT_QALLOC( sfnt_data, rlen ) )
2216	2216	return error;
2217		- error = FT_Stream_Read( stream, (FT_Byte *)sfnt_data, (FT_ULong)rlen );
	2217	+ error = FT_Stream_Read( stream, (FT_Byte *)sfnt_data, rlen );
2218	2218	if ( error )
2219	2219	{
2220	2220	FT_FREE( sfnt_data );
...	...	@@ -2224,7 +2224,7 @@
2224	2224	is_cff = rlen > 4 && !ft_memcmp( sfnt_data, "OTTO", 4 );
2225	2225	error = open_face_from_buffer( library,
2226	2226	sfnt_data,
2227		- (FT_ULong)rlen,
	2227	+ rlen,
2228	2228	face_index_in_resource,
2229	2229	is_cff ? "cff" : "truetype",
2230	2230	aface );

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.