[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master bee888640 1/2: Clean-up - do not doubt FT_FREE.
From: |
Werner Lemberg |
Subject: |
[freetype2] master bee888640 1/2: Clean-up - do not doubt FT_FREE. |
Date: |
Sun, 30 Jan 2022 22:19:24 -0500 (EST) |
branch: master
commit bee8886408a82c244956b76db4ab7b79cdca9079
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
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.
---
src/base/ftobjs.c | 1 -
src/psaux/psobjs.c | 1 -
src/sfnt/sfwoff.c | 1 -
src/sfnt/sfwoff2.c | 1 -
src/truetype/ttgxvar.c | 3 ---
5 files changed, 7 deletions(-)
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index d265e740e..2c0f0e6c9 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1674,7 +1674,6 @@
FT_FREE( stream->base );
stream->size = 0;
- stream->base = NULL;
stream->close = NULL;
}
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 6871eb760..212a657f1 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1188,7 +1188,6 @@
FT_TRACE0(( "ps_parser_load_field: overwriting field %s\n",
field->ident ));
FT_FREE( *(FT_String**)q );
- *(FT_String**)q = NULL;
}
if ( FT_QALLOC( string, len + 1 ) )
diff --git a/src/sfnt/sfwoff.c b/src/sfnt/sfwoff.c
index 68609a728..0e8ec3fa9 100644
--- a/src/sfnt/sfwoff.c
+++ b/src/sfnt/sfwoff.c
@@ -64,7 +64,6 @@
FT_FREE( stream->base );
stream->size = 0;
- stream->base = NULL;
stream->close = NULL;
}
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index f1f2eef45..cb1e0664a 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -94,7 +94,6 @@
FT_FREE( stream->base );
stream->size = 0;
- stream->base = NULL;
stream->close = NULL;
}
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 2a7f9171c..6a0edef29 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -415,7 +415,6 @@
FT_FREE( blend->avar_segment[j].correspondence );
FT_FREE( blend->avar_segment );
- blend->avar_segment = NULL;
goto Exit;
}
@@ -2747,7 +2746,6 @@
/* The cvt table has been loaded already; every time we change the */
/* blend we may need to reload and remodify the cvt table. */
FT_FREE( face->cvt );
- face->cvt = NULL;
error = tt_face_load_cvt( face, face->root.stream );
break;
@@ -2766,7 +2764,6 @@
/* enforce recomputation of the PostScript name; */
FT_FREE( face->postscript_name );
- face->postscript_name = NULL;
Exit:
return error;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master bee888640 1/2: Clean-up - do not doubt FT_FREE.,
Werner Lemberg <=