[Git][freetype/freetype][master] [base] Initialize stream memory earlier.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• b4dddd82
  by Alexei Podtelezhnikov at 2021-09-22T00:30:03-04:00

  [base] Initialize stream memory earlier.
  
  With Windows memory management tracking heap, it is important to use
  it during the stream opening fallback. In Unix, the argument is
  unused, but it is better to set it correctly.
  
  * src/base/ftobjs.c (FT_Stream_New): Set memory before calling
  `FT_Stream_Open`.
  * builds/windows/ftsystem.c, builds/unix/ftsystem.c (FT_Stream_Open,
  ft_close_stream_by_free): Call `ft_alloc` and `ft_free` with proper
  memory argumment.
  

3 changed files:

• builds/unix/ftsystem.c
• builds/windows/ftsystem.c
• src/base/ftobjs.c

Changes:

builds/unix/ftsystem.c

---

...	...	@@ -233,7 +233,7 @@
233	233	FT_CALLBACK_DEF( void )
234	234	ft_close_stream_by_free( FT_Stream stream )
235	235	{
236		- ft_free( NULL, stream->descriptor.pointer );
	236	+ ft_free( stream->memory, stream->descriptor.pointer );
237	237
238	238	stream->descriptor.pointer = NULL;
239	239	stream->size = 0;
...	...	@@ -324,7 +324,7 @@
324	324	FT_ERROR(( "FT_Stream_Open:" ));
325	325	FT_ERROR(( " could not `mmap' file `%s'\n", filepathname ));
326	326
327		- stream->base = (unsigned char*)ft_alloc( NULL, stream->size );
	327	+ stream->base = (unsigned char*)ft_alloc( stream->memory, stream->size );
328	328
329	329	if ( !stream->base )
330	330	{
...	...	@@ -374,7 +374,7 @@
374	374	return FT_Err_Ok;
375	375
376	376	Fail_Read:
377		- ft_free( NULL, stream->base );
	377	+ ft_free( stream->memory, stream->base );
378	378
379	379	Fail_Map:
380	380	close( file );

builds/windows/ftsystem.c

---

...	...	@@ -188,7 +188,7 @@
188	188	FT_CALLBACK_DEF( void )
189	189	ft_close_stream_by_free( FT_Stream stream )
190	190	{
191		- ft_free( NULL, stream->descriptor.pointer );
	191	+ ft_free( stream->memory, stream->descriptor.pointer );
192	192
193	193	stream->descriptor.pointer = NULL;
194	194	stream->size = 0;
...	...	@@ -323,7 +323,7 @@
323	323	FT_ERROR(( "FT_Stream_Open:" ));
324	324	FT_ERROR(( " could not `mmap' file `%s'\n", filepathname ));
325	325
326		- stream->base = (unsigned char*)ft_alloc( NULL, stream->size );
	326	+ stream->base = (unsigned char*)ft_alloc( stream->memory, stream->size );
327	327
328	328	if ( !stream->base )
329	329	{
...	...	@@ -369,7 +369,7 @@
369	369	return FT_Err_Ok;
370	370
371	371	Fail_Read:
372		- ft_free( NULL, stream->base );
	372	+ ft_free( stream->memory, stream->base );
373	373
374	374	Fail_Open:
375	375	CloseHandle( file );

src/base/ftobjs.c

---

...	...	@@ -221,6 +221,7 @@
221	221	FT_Stream_OpenMemory( stream,
222	222	(const FT_Byte*)args->memory_base,
223	223	(FT_ULong)args->memory_size );
	224	+ stream->memory = memory;
224	225	}
225	226
226	227	#ifndef FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT
...	...	@@ -231,6 +232,7 @@
231	232	if ( FT_NEW( stream ) )
232	233	goto Exit;
233	234
	235	+ stream->memory = memory;
234	236	error = FT_Stream_Open( stream, args->pathname );
235	237	if ( error )
236	238	FT_FREE( stream );
...	...	@@ -241,8 +243,9 @@
241	243
242	244	/* in this case, we do not need to allocate a new stream object */
243	245	/* since the caller is responsible for closing it himself */
244		- stream = args->stream;
245		- error = FT_Err_Ok;
	246	+ stream = args->stream;
	247	+ stream->memory = memory;
	248	+ error = FT_Err_Ok;
246	249	}
247	250
248	251	#endif
...	...	@@ -255,10 +258,7 @@
255	258	}
256	259
257	260	if ( !error )
258		- {
259		- stream->memory = memory;
260	261	*astream = stream;
261		- }
262	262
263	263	Exit:
264	264	return error;

—
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.