Ticket #680: pslib-0.9.99-psdb_fixes.patch

src/db/psDB.c

@@ -307 +307 @@
 
     // Get number of rows returned in result
     rowCount = mysql_num_rows(result);
+    // XXX has mysql's semantics changed?  If this is zero then why was a
+    // result set returned?
+    if (!rowCount) {
+        mysql_free_result(result);
+        return NULL;
+    }
 
     // pre-allocate enough elements to hold the complete result set
     // then reset n to 0 so elements are added from the beginning of
@@ -475 +481 @@
     }
 
     rowCount = mysql_num_rows(result);
+    // XXX has mysql's semantics changed?  If this is zero then why was a
+    // result set returned?
+    if (rowCount == 0) {
+        mysql_free_result(result);
+        return NULL;
+    }
 
     // pre-allocate enough elements to hold the complete result set
     // then reset n to 0 so elements are added from the beginning of
@@ -1257 +1269 @@
             psStringAppend(&query, "%s=%d", item->name, (int)(item->data.B));
         } else if (item->type == PS_DATA_STRING) {
             // + column name + _ + like + _ + ' + value + '
-            if (*(char *)item->data.V == '\0') {
+            // check for NULL and empty ("") strings
+            if (item->data.V == NULL || *(char *)item->data.V == '\0') {
                 psStringAppend(&query, "%s IS NULL", item->name);
             } else {
                 // XXX ASC NOTE: we should have a better match for