- Begin fixing memory leaks

modified: storage/connect/connect.cc storage/connect/plugutil.c

- Begin fixing memory leaks
modified: storage/connect/connect.cc storage/connect/plugutil.c
cdf3606b · Olivier Bertrand · 612b8c55 · cdf3606b · cdf3606b
Commit cdf3606b authored Mar 01, 2013 by Olivier Bertrand
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

storage/connect/connect.cc storage/connect/connect.cc +4 -7

storage/connect/plugutil.c storage/connect/plugutil.c +1 -4

No files found.
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -74,15 +74,12 @@ PGLOBAL CntExit(PGLOBAL g)
    PDBUSER dup= PlgGetUser(g);
    CntEndDB(g);
-    PlugExit(g);
+    free(dup);
-    if (dup->Catalog) {
+    if (g->Activityp)
-      delete dup->Catalog;
+      delete g->Activityp;
-      dup->Catalog= NULL;
-      } // endif
-    free(dup);
+    PlugExit(g);
-    free(g->Activityp);
    g= NULL;
    } // endif g

--- a/storage/connect/plugutil.c
+++ b/storage/connect/plugutil.c
@@ -174,12 +174,9 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize)
 int PlugExit(PGLOBAL g)
  {
  int rc = 0;
-  PACTIVITY ap;
  if (!g)
    return rc;
-  else
-    ap = g->ActivityStart;
  free(g->Sarea);
  free(g);