Changeset 10913 for trunk/ippTools/src/pxadminConfig.c

Timestamp:

Jan 4, 2007, 6:29:34 PM (19 years ago)

Author:

jhoblitt

Message:

plug some memory leaks

File:

• trunk/ippTools/src/pxadminConfig.c (modified) (5 diffs)

trunk/ippTools/src/pxadminConfig.c

@@ -34 +34 @@
 
     config->modules = pmConfigRead(&argc, argv, NULL);
-
-
-    if (! config->modules) {
-        psErrorStackPrint(stderr, "Can't find site configuration!\n");
-        exit(EXIT_FAILURE);
+    if (!config->modules) {
+        psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
+        goto FAIL;
     }
 
@@ -80 +78 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        exit(EXIT_FAILURE);
+        goto FAIL; 
     }
 
@@ -86 +84 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        exit(EXIT_FAILURE);
+        goto FAIL; 
     }
 
@@ -95 +93 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        exit(EXIT_FAILURE);
+        goto FAIL; 
     }
 
@@ -104 +102 @@
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");
-        exit(EXIT_FAILURE);
+        goto FAIL; 
     }
 
+    // save argv/argc
+    config->argv = argv;
+    config->argc = argc;
+
     return config;
+
+FAIL:
+    psFree(config);
+    pmConfigDone();
+    psLibFinalize();
+    exit(EXIT_FAILURE);
 }