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

Timestamp:

Aug 25, 2006, 12:02:40 PM (20 years ago)

Author:

jhoblitt

Message:

bug #809 - use psStringAppendV() instead of calling vsnprintf() directly in p_psDBRunQuery() & p_psDBRunQueryPrepared(). This is to fix a) the segfaults on amd64 caused by unsafe repeated use of va_lists and b) eliminates code duplicated code.

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-23 23:23:13 $
+ *  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-25 22:02:40 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -808 +808 @@
 
     // Run query
-    va_list argPtr;
-    va_start(argPtr, format);
-    if(argPtr == NULL) {
-        query = psStringCopy(format);
-    } else {
-        int destSize = vsnprintf(query, 0, format, argPtr);
-        query = psAlloc(destSize+1);
-        vsnprintf(query, destSize+1, format, argPtr);
-    }
-    va_end(argPtr);
+    va_list ap;
+    va_start(ap, format);
+    psStringAppendV(&query, format, ap);
+    va_end(ap);
 
     psTrace("psLib.db", PS_LOG_INFO, "Executing SQL: %s", query);
@@ -852 +846 @@
 
     // generate query string
-    va_list argPtr;
-    va_start(argPtr, format);
-    if(argPtr == NULL) {
-        query = psStringCopy(format);
-    } else {
-        int destSize = vsnprintf(query, 0, format, argPtr);
-        query = psAlloc(destSize + 1);
-        vsnprintf(query, destSize + 1, format, argPtr);
-    }
-    va_end(argPtr);
+    va_list ap;
+    va_start(ap, format);
+    psStringAppendV(&query, format, ap);
+    va_end(ap);
 
     psTrace("psLib.db", PS_LOG_INFO, "Executing SQL: %s", query);