Changeset 8709 for trunk/MagicSoft/Mars/msql

Timestamp:

08/25/07 16:30:26 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msql

Files:

• MSQLMagic.cc (modified) (3 diffs)
• MSQLServer.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/msql/MSQLMagic.cc

@@ -69 +69 @@
     const TString rc = row ? (*row)[0] : "";
 
+    if (row)
+        delete row;
+
     delete res;
     return rc;
@@ -124 +127 @@
 
     const Int_t rc1 = row && (*row)[0] ? atoi((*row)[0]) : -1;
+
+    if (row)
+        delete row;
+
     delete res1;
+
     return rc1;
 }
@@ -191 +199 @@
     if (row && (*row)[0])
         rc=kTRUE;
+
+    if (row)
+        delete row;
 
     delete res;

trunk/MagicSoft/Mars/msql/MSQLServer.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.13 2006-11-01 08:29:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.14 2007-08-25 15:30:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -82 +82 @@
 
     TSQLRow *row=res->Next();
-    const TString desc((*row)[1]);
+    const TString desc(row ? (*row)[1] : "");
+
+    if (row)
+        delete row;
 
     delete res;
@@ -178 +181 @@
     {
         TString row0((*row)[0]);
+        delete row;
 
         MSQLServer *sql = (MSQLServer*)fList.FindObject(Form("%s/%s/%s", (const char*)fDataBase, (const char*)fTable, (const char*)row0));
@@ -202 +206 @@
     {
         TString row0((*row)[0]);
+        delete row;
 
         MSQLServer *sql = (MSQLServer*)fList.FindObject(Form("%s/%s", (const char*)fDataBase, (const char*)row0));
@@ -226 +231 @@
     {
         const TString row0((*row)[0]);
+        delete row;
 
         MSQLServer *sql = (MSQLServer*)fList.FindObject(row0);
@@ -257 +263 @@
 
     TList rows;
+    rows.SetOwner();
+
     while ((row=res.Next()))
     {
@@ -305 +313 @@
 
     TList rows;
+    rows.SetOwner();
+
     while ((row=res->Next()))
         rows.Add(row);
@@ -767 +777 @@
     while ((row=res->Next()))
     {
-        TString key = (*row)[3];
-        if (key!="PRI")
-            continue;
-
-        rc = (*row)[0];
-        break;
+        const TString key = (*row)[3];
+        if (key=="PRI")
+        {
+            rc = (*row)[0];
+            break;
+        }
+        delete row;
     }