Merge pull request #1777 from fontforge/coverity_fixes_20141007_1

Fix defects from the groups merge.
fontforge · Oct 8, 2014 · df39e9f · df39e9f
2 parents 8ae0caa + 33e09f1
commit df39e9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/fontforge/autowidth2.c b/fontforge/autowidth2.c
@@ -835,13 +835,13 @@ return;
     if (kc->firsts != NULL) {
       int tmppos;
       for (tmppos = 0; tmppos < kc->first_cnt; tmppos++)
-        if (kc->firsts[tmppos] != NULL) { free(kc->firsts); kc->firsts = NULL; }
+        if (kc->firsts[tmppos] != NULL) { free(kc->firsts[tmppos]); kc->firsts[tmppos] = NULL; }
       free(kc->firsts); kc->firsts = NULL;
     }
     if (kc->seconds != NULL) {
       int tmppos;
       for (tmppos = 0; tmppos < kc->second_cnt; tmppos++)
-        if (kc->seconds[tmppos] != NULL) { free(kc->seconds); kc->seconds = NULL; }
+        if (kc->seconds[tmppos] != NULL) { free(kc->seconds[tmppos]); kc->seconds[tmppos] = NULL; }
       free(kc->seconds); kc->seconds = NULL;
     }
     free(kc->offsets);
@@ -852,13 +852,13 @@ return;
     if (kc->firsts_names != NULL) {
       int tmppos;
       for (tmppos = 0; tmppos < kc->first_cnt; tmppos++)
-        if (kc->firsts_names[tmppos] != NULL) { free(kc->firsts_names); kc->firsts_names = NULL; }
+        if (kc->firsts_names[tmppos] != NULL) { free(kc->firsts_names[tmppos]); kc->firsts_names[tmppos] = NULL; }
       free(kc->firsts_names); kc->firsts_names = NULL;
     }
     if (kc->seconds_names != NULL) {
       int tmppos;
       for (tmppos = 0; tmppos < kc->second_cnt; tmppos++)
-        if (kc->seconds_names[tmppos] != NULL) { free(kc->seconds_names); kc->seconds_names = NULL; }
+        if (kc->seconds_names[tmppos] != NULL) { free(kc->seconds_names[tmppos]); kc->seconds_names[tmppos] = NULL; }
       free(kc->seconds_names); kc->seconds_names = NULL;
     }
     if (kc->firsts_flags != NULL) { free(kc->firsts_flags); kc->firsts_flags = NULL; }

diff --git a/fontforge/ufo.c b/fontforge/ufo.c
@@ -1650,6 +1650,7 @@ int ufo_kerning_tree_attempt_insert(struct ufo_kerning_tree_session *session, co
     }
   }
   free(tmppairname); tmppairname = NULL;
+  return 0;
 }
 
 

diff --git a/fontforgeexe/kernclass.c b/fontforgeexe/kernclass.c
@@ -2296,7 +2296,7 @@ static void KCD_RowMotion(GGadget *g,int oldr, int newr) {
 	    kcd->seconds_names[oldr] = kcd->seconds_names[newr];
 	    kcd->seconds_names[newr] = name;
 	}
-	if (kcd->firsts_flags) {
+	if (kcd->seconds_flags) {
 	    int flags = kcd->seconds_flags[oldr];
 	    kcd->seconds_flags[oldr] = kcd->seconds_flags[newr];
 	    kcd->seconds_flags[newr] = flags;
@@ -2341,7 +2341,7 @@ static void KCD_DeleteClass(GGadget *g,int whichclass) {
 	  memmove(kcd->firsts_names+whichclass, kcd->firsts_names+whichclass + 1, (kcd->first_cnt - whichclass - 1) * sizeof(char*));
 	  kcd->firsts_names = realloc(kcd->firsts_names, (kcd->first_cnt - 1) * sizeof(char*));
 	}
-	if (kcd->seconds_flags) {
+	if (kcd->firsts_flags) {
 	  memmove(kcd->firsts_flags+whichclass, kcd->firsts_flags+whichclass + 1, (kcd->first_cnt - whichclass - 1) * sizeof(int));
 	  kcd->firsts_flags = realloc(kcd->firsts_flags, (kcd->first_cnt - 1) * sizeof(int));
 	}