[Git][freetype/freetype][master] 2 commits: Clean-up - do not doubt FT_FREE.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• bee88864
  by Alexei Podtelezhnikov at 2022-01-30T21:55:21-05:00

  Clean-up - do not doubt FT_FREE.
  
  * src/base/ftobjs.c (memory_stream_close): Do not reassign zero
  after `FT_FREE`.
  * src/sfnt/sfwoff.c (sfnt_stream_close): Ditto.
  * src/sfnt/sfwoff2.c (stream_close): Ditto.
  * src/psaux/psobjs.c (ps_parser_load_field): Ditto.
  * src/truetype/ttgxvar.c (ft_var_load_avar, tt_set_mm_blend,
  tt_set_mm_blend): Ditto.
  

• 983d4358
  by Alexei Podtelezhnikov at 2022-01-30T22:13:51-05:00

  [cache] Fix fallouts from edd4fedc5427.
  
  Reported by Werner.
  
  * src/cache/ftcimage.c (FTC_INode_New): Always initialize FT_Glyph.
  * src/cache/ftcsbits.c (FTC_SNode_New): Always initialize FT_SBit.
  

7 changed files:

• src/base/ftobjs.c
• src/cache/ftcimage.c
• src/cache/ftcsbits.c
• src/psaux/psobjs.c
• src/sfnt/sfwoff.c
• src/sfnt/sfwoff2.c
• src/truetype/ttgxvar.c

Changes:

src/base/ftobjs.c

---

...	...	@@ -1674,7 +1674,6 @@
1674	1674	FT_FREE( stream->base );
1675	1675
1676	1676	stream->size = 0;
1677		- stream->base = NULL;
1678	1677	stream->close = NULL;
1679	1678	}
1680	1679

src/cache/ftcimage.c

---

...	...	@@ -74,6 +74,7 @@
74	74
75	75	/* initialize its inner fields */
76	76	FTC_GNode_Init( gnode, gindex, family );
	77	+ inode->glyph = NULL;
77	78
78	79	/* we will now load the glyph image */
79	80	error = clazz->family_load_glyph( family, gindex, cache,

src/cache/ftcsbits.c

---

...	...	@@ -248,7 +248,9 @@
248	248	snode->count = count;
249	249	for ( node_count = 0; node_count < count; node_count++ )
250	250	{
251		- snode->sbits[node_count].width = 255;
	251	+ snode->sbits[node_count].width = 255;
	252	+ snode->sbits[node_count].height = 0;
	253	+ snode->sbits[node_count].buffer = NULL;
252	254	}
253	255
254	256	error = ftc_snode_load( snode,

src/psaux/psobjs.c

---

...	...	@@ -1188,7 +1188,6 @@
1188	1188	FT_TRACE0(( "ps_parser_load_field: overwriting field %s\n",
1189	1189	field->ident ));
1190	1190	FT_FREE( *(FT_String**)q );
1191		- *(FT_String**)q = NULL;
1192	1191	}
1193	1192
1194	1193	if ( FT_QALLOC( string, len + 1 ) )

src/sfnt/sfwoff.c

---

...	...	@@ -64,7 +64,6 @@
64	64	FT_FREE( stream->base );
65	65
66	66	stream->size = 0;
67		- stream->base = NULL;
68	67	stream->close = NULL;
69	68	}
70	69

src/sfnt/sfwoff2.c

---

...	...	@@ -94,7 +94,6 @@
94	94	FT_FREE( stream->base );
95	95
96	96	stream->size = 0;
97		- stream->base = NULL;
98	97	stream->close = NULL;
99	98	}
100	99

src/truetype/ttgxvar.c

---

...	...	@@ -415,7 +415,6 @@
415	415	FT_FREE( blend->avar_segment[j].correspondence );
416	416
417	417	FT_FREE( blend->avar_segment );
418		- blend->avar_segment = NULL;
419	418	goto Exit;
420	419	}
421	420
...	...	@@ -2747,7 +2746,6 @@
2747	2746	/* The cvt table has been loaded already; every time we change the */
2748	2747	/* blend we may need to reload and remodify the cvt table. */
2749	2748	FT_FREE( face->cvt );
2750		- face->cvt = NULL;
2751	2749
2752	2750	error = tt_face_load_cvt( face, face->root.stream );
2753	2751	break;
...	...	@@ -2766,7 +2764,6 @@
2766	2764
2767	2765	/* enforce recomputation of the PostScript name; */
2768	2766	FT_FREE( face->postscript_name );
2769		- face->postscript_name = NULL;
2770	2767
2771	2768	Exit:
2772	2769	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.