Changeset 7975 for trunk/psLib/src/db/psDB.c

Timestamp:

Jul 25, 2006, 3:15:56 PM (20 years ago)

Author:

jhoblitt

Message:

add psDBMysqlRowRecycle()
use psDBMysqlRowRecycle() to fix a memory leak in p_psDBRunQueryPrepared()

File:

• trunk/psLib/src/db/psDB.c (modified) (5 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-14 02:04:19 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-26 01:15:56 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -71 +71 @@
 static psDBMysqlRow *psDBMysqlRowAlloc(psU32 paramCount);
 static void psDBMysqlRowFree(psDBMysqlRow *row);
+static void psDBMysqlRowRecycle(psDBMysqlRow *mysqlRow);
 
 // SQL generation functions
@@ -857 +858 @@
     for (long j = 0; j < rowSet->n; j++) {
         psMetadata *rowData = rowSet->data[j];
+
+        psDBMysqlRowRecycle(mysqlRow);
 
         if (!psDBPackMySQLRow(mysqlRow, rowData)) {
@@ -1175 +1178 @@
     MYSQL_BIND *bind = mysqlRow->bind;
 
+    psDBMysqlRowRecycle(mysqlRow);
+
+    psFree(bind);
+}
+
+static void psDBMysqlRowRecycle(psDBMysqlRow *mysqlRow)
+{
+    PS_ASSERT_PTR_NON_NULL(mysqlRow, );
+
+    MYSQL_BIND *bind = mysqlRow->bind;
+
     for (psU32 i = 0; i < mysqlRow->n; i++) {
         // buffer_length is only defined for pointers to character buffers
@@ -1182 +1196 @@
         }
     }
-
-    psFree(bind);
 }