Changeset 10074

Timestamp:

Nov 17, 2006, 6:04:14 PM (19 years ago)

Author:

jhoblitt

Message:

fix mem corruption & leaks

Location:

trunk/ippTools/src

Files:

• pxadminConfig.c (modified) (3 diffs)
• pxtables.c (modified) (5 diffs)

trunk/ippTools/src/pxadminConfig.c

@@ -34 +34 @@
 
     config->modules = pmConfigRead(&argc, argv);
+
 
     if (! config->modules) {
@@ -97 +98 @@
     }
 
+   psFree(arguments);
+
     // define Database handle, if used
     config->dbh = pmConfigDB(config->modules);
@@ -103 +106 @@
         exit(EXIT_FAILURE);
     }
-
-    config->args = arguments;
 
     return config;

trunk/ippTools/src/pxtables.c

@@ -40 +40 @@
 
 bool pxCreateTables(pxConfig *config) {
-    bool            status = true;
-
     PS_ASSERT_PTR_NON_NULL(config, false);
 
@@ -52 +50 @@
     }
 #endif
+
+    bool            status = true;
     CREATE_TABLE(summitExpCreateTable);
     CREATE_TABLE(summitImfileCreateTable);
@@ -102 +102 @@
     fgets (line, 128, stdin);
     sscanf (line, "%s", answer);
-    if (strcmp (answer, "YES")) goto escape;
+    if (strcmp (answer, "YES"))  {
+        psError(PS_ERR_UNKNOWN, true, "tables NOT deleleted");
+        return false;
+    }
 
     fprintf (stdout, "enter dbh connection password: ");
@@ -111 +114 @@
         bool status;
         psString dbPassword = psMetadataLookupStr(&status, config->modules->site, "DBPASSWORD");
-        if (strcmp (answer, dbPassword)) goto escape;
-        psFree(dbPassword);
+        if (strcmp (answer, dbPassword)) {
+            psError(PS_ERR_UNKNOWN, true, "tables NOT deleleted");
+            return false;
+        }
     }
 
@@ -151 +156 @@
 
     return status;
-
-escape:
-    // XXX fix psMetadataLookupStr() to inc ref count
-    // psFree(dbPassword);
-    fprintf (stdout, "tables NOT deleted\n");
-
-    return false;
 }