diff --git a/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch b/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch index 2711e7b..d24dda6 100644 --- a/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch +++ b/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch @@ -1,6 +1,62 @@ +diff -Naurp a/fontforge/bitmapchar.c b/fontforge/bitmapchar.c +--- a/fontforge/bitmapchar.c 2019-05-29 23:01:41.558539879 +0000 ++++ b/fontforge/bitmapchar.c 2019-05-30 01:56:44.866932108 +0000 +@@ -372,7 +372,7 @@ void SFReplaceFontnameBDFProps(SplineFon + } + } + free(bpt); +- free(pt); ++ //free(pt); + } + + BDFProperties *BdfPropsCopy(BDFProperties *props, int cnt ) { +diff -Naurp a/fontforge/featurefile.c b/fontforge/featurefile.c +--- a/fontforge/featurefile.c 2019-05-29 23:01:41.562539887 +0000 ++++ b/fontforge/featurefile.c 2019-05-30 01:56:44.867932111 +0000 +@@ -4648,7 +4648,7 @@ static FPST *fea_markedglyphs_to_fpst(st + } + r->lookup_cnt = lc; + } +- free(bcovers); ++ //free(bcovers); + return( fpst ); + } + +@@ -7101,7 +7101,7 @@ static struct feat_item *fea_ApplyFeatur + } + if ( f!=NULL && f->type == ft_feat_end ) + f = f->next; +- free(sl); ++ //free(sl); //??? + return( f ); + } + +diff -Naurp a/fontforge/plugins.c b/fontforge/plugins.c +--- a/fontforge/plugins.c 2019-05-29 23:01:41.571539906 +0000 ++++ b/fontforge/plugins.c 2019-05-30 01:56:44.869932118 +0000 +@@ -35,7 +35,7 @@ + int LoadPlugin(const char *dynamic_lib_name) { + lt_dlhandle plugin; + plugin = load_plugin(dynamic_lib_name, LogError); +- free(plugin); ++ //free(plugin); + return (plugin != NULL); + } + +diff -Naurp a/fontforge/psread.c b/fontforge/psread.c +--- a/fontforge/psread.c 2019-05-29 23:01:41.573539911 +0000 ++++ b/fontforge/psread.c 2019-05-30 01:56:44.951932373 +0000 +@@ -4690,6 +4690,6 @@ SplineChar *PSCharStringToSplines(uint8 + if ( name!=NULL && strcmp(name,".notdef")!=0 ) + ret->widthset = true; + free(pending_hm); +- free(pt); ++ //free(pt); + return( ret ); + } diff -Naurp a/fontforge/sfd.c b/fontforge/sfd.c ---- a/fontforge/sfd.c 2019-05-29 13:49:19.779285493 -0300 -+++ b/fontforge/sfd.c 2019-05-29 14:02:42.013828803 -0300 +--- a/fontforge/sfd.c 2019-05-29 23:01:41.583539931 +0000 ++++ b/fontforge/sfd.c 2019-05-30 01:56:44.962932407 +0000 @@ -8302,7 +8302,7 @@ bool SFD_GetFontMetaData( FILE *sfd, // return false; @@ -10,3 +66,33 @@ diff -Naurp a/fontforge/sfd.c b/fontforge/sfd.c return true; } +@@ -8746,7 +8746,7 @@ static SplineFont *SFD_GetFont( FILE *sf + else if ( lastnamedinstance !=NULL ) + lastnamedinstance->names = names; + pushedbacktok = true; +- free(names); ++ //free(names); + } else if ( strmatch(tok,"MMCDV:")==0 ) { + MMSet *mm = sf->mm; + if ( mm!=NULL ) +@@ -8870,7 +8870,7 @@ exit( 1 ); + if (sf->map == NULL) sf->map = EncMapNew(sf->glyphcnt,sf->glyphcnt,&custom); + + SFDFixupUndoRefs(sf); +- free(remap); ++ //free(remap); + return( sf ); + } + +diff -Naurp a/fontforge/ttfspecial.c b/fontforge/ttfspecial.c +--- a/fontforge/ttfspecial.c 2019-05-29 23:01:41.594539954 +0000 ++++ b/fontforge/ttfspecial.c 2019-05-30 01:56:45.001932528 +0000 +@@ -1356,7 +1356,7 @@ static void pfed_read_glyph_layer(FILE * + } + } + free(contours); +- free(cur); ++ //free(cur); + } + + static void pfed_readguidelines(FILE *ttf,struct ttfinfo *info,uint32 base) { diff --git a/SPECS/fontforge.spec b/SPECS/fontforge.spec index 748375a..48e8419 100644 --- a/SPECS/fontforge.spec +++ b/SPECS/fontforge.spec @@ -4,7 +4,7 @@ Name: fontforge Version: %{gittag0} -Release: 8%{?dist}.0.1 +Release: 8%{?dist}.0.2 Summary: Outline and bitmap font editor License: GPLv3+ @@ -158,6 +158,9 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/contentEd %doc htdocs %changelog +* Wed May 29 2019 Pablo Greco - 20170731-8.0.2 +- Fix more segfaults (https://bugzilla.redhat.com/show_bug.cgi?id=1665939) + * Wed May 29 2019 Pablo Greco - 20170731-8.0.1 - Fix segfault building some fonts (https://bugzilla.redhat.com/show_bug.cgi?id=1665939)