dthelp: compiler warning and coverity warning fixes

2018-03-29 00:21:44 +01:00
parent 50a96959f0
commit e12e009eb5
14 changed files with 68 additions and 34 deletions
--- a/cde/programs/dthelp/parser/pass2/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass2/util/conutil.c
@@ -424,8 +424,12 @@ if (loading) newdlm = (char **) calloc(trysize, sizeof(M_WCHAR *));
 if (! newtransit || (loading && ! newdlm))
    {
    trysize = NUMDELIM + 1;
+    free(newtransit);
    newtransit = (int *) calloc(NUMCON * trysize, sizeof(int));
-    if (loading) newdlm = (char **) calloc(trysize, sizeof(M_WCHAR *));
+    if (loading) {
+      free(newdlm);
+      newdlm = (char **) calloc(trysize, sizeof(M_WCHAR *));
+    }
    }
 if (! newtransit || (loading && ! newdlm))
    {