Blob Blame History Raw
diff -urN fontforge-20120731-b.old/fontforge/sfd1.c fontforge-20120731-b/fontforge/sfd1.c
--- fontforge-20120731-b.old/fontforge/sfd1.c	2012-08-02 20:39:09.000000000 +0530
+++ fontforge-20120731-b/fontforge/sfd1.c	2020-04-08 14:15:27.262285908 +0530
@@ -667,7 +667,7 @@
 
     /* Fix up some gunk from really old versions of the sfd format */
     SFDCleanupAnchorClasses(&sf->sf);
-    if ( sf->sf.uni_interp==ui_unset )
+    if ( sf->sf.uni_interp==ui_unset && sf->sf.map!=NULL )
 	sf->sf.uni_interp = interp_from_encoding(sf->sf.map->enc,ui_none);
 
     /* Fixup for an old bug */
diff -urN fontforge-20120731-b.old/fontforge/sfd.c fontforge-20120731-b/fontforge/sfd.c
--- fontforge-20120731-b.old/fontforge/sfd.c	2012-08-02 20:39:09.000000000 +0530
+++ fontforge-20120731-b/fontforge/sfd.c	2020-04-08 14:16:37.448996390 +0530
@@ -3333,13 +3333,16 @@
     while ( fscanf(sfd,"%lg %lg %c", &cp.x, &cp.y, &cp.ty )==3 ) {
 	if ( cur!=NULL ) {
 	    if ( cur->spiro_cnt>=cur->spiro_max )
-		cur->spiros = grealloc(cur->spiros,(cur->spiro_max+=10)*sizeof(spiro_cp));
+		cur->spiros = realloc(cur->spiros,
+		                      (cur->spiro_max+=10)*sizeof(spiro_cp));
 	    cur->spiros[cur->spiro_cnt++] = cp;
 	}
     }
-    if ( cur!=NULL && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
+    if (    cur!=NULL && cur->spiro_cnt>0
+         && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
 	if ( cur->spiro_cnt>=cur->spiro_max )
-	    cur->spiros = grealloc(cur->spiros,(cur->spiro_max+=1)*sizeof(spiro_cp));
+	    cur->spiros = realloc(cur->spiros,
+	                          (cur->spiro_max+=1)*sizeof(spiro_cp));
 	memset(&cur->spiros[cur->spiro_cnt],0,sizeof(spiro_cp));
 	cur->spiros[cur->spiro_cnt++].ty = SPIRO_END;
     }
@@ -6611,8 +6614,10 @@
 	    sf->grid.order2 = o2;
 	} else if ( strmatch(tok,"LayerCount:")==0 ) {
 	    had_layer_cnt = true;
-	    getint(sfd,&sf->layer_cnt);
-	    if ( sf->layer_cnt>2 ) {
+	    int layer_cnt_tmp;
+	    getint(sfd,&layer_cnt_tmp);
+	    if ( layer_cnt_tmp>2 ) {
+	        sf->layer_cnt = layer_cnt_tmp;
 		sf->layers = grealloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
 		memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
 	    }
@@ -7227,6 +7232,10 @@
 	}
     }
 
+    // Many downstream functions assume this isn't NULL (use strlen, etc.)
+    if ( sf->fontname==NULL)
+	sf->fontname = copy("");
+
     if ( fromdir )
 	sf = SFD_FigureDirType(sf,tok,dirname,enc,remap,had_layer_cnt);
     else if ( sf->subfontcnt!=0 ) {