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

Timestamp:

Jun 6, 2006, 5:30:45 PM (20 years ago)

Author:

Paul Price

Message:

Patch from Josh to correctly handle the insertion of NULL strings.

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 23:22:17 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-07 03:30:45 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -1060 +1060 @@
             // convert NaNs to NULL and set the buffer_length for strings
 
-            bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
-            bind[i].length  = &bind[i].buffer_length;
-            bind[i].buffer  = item->data.V;
-            bind[i].is_null = *(char *)item->data.V == '\0'
-                              ? (my_bool *)&isNull
-                              : NULL;
+            if ((char *)item->data.V) {
+                // will handle the case of "" as a NULL database value
+                bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
+                bind[i].length  = &bind[i].buffer_length;
+                bind[i].buffer  = item->data.V;
+                bind[i].is_null = *(char *)item->data.V == '\0'
+                                  ? (my_bool *)&isNull
+                                  : NULL;
+            } else {
+                // handles the case of NULL as a NULL database value
+                bind[i].buffer_length = 0;
+                bind[i].length  = &bind[i].buffer_length;
+                bind[i].buffer  = NULL;
+                bind[i].is_null = (my_bool *)&isNull;
+            }
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE , true,