Changeset 9681

Timestamp:

Oct 20, 2006, 2:33:00 PM (20 years ago)

Author:

jhoblitt

Message:

fix NULL time value pass throught in p_psDBFetchResult()

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-21 00:10:41 $
+ *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-21 00:33:00 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1009 +1009 @@
                 psMetadataAdd(md, PS_LIST_TAIL, field[i].name, pType, "", atoi(data));
             } else if (pType == PS_DATA_TIME) {
-                psTime *time = psTimeStrptime((char *)data, "%EY-%m-%d%t%T");
-                if (!time) {
-                    psError(PS_ERR_UNKNOWN, true, "error parsing MySQL DateTime string");
-                    psFree(md);
-                    mysql_free_result(result);
-                    psFree(resultSet);
-                    return NULL;
+                // just pass NULL values through as there is currently no
+                // concept of a psTime with a NULL value
+                if (!(char *)data) {
+                    psMetadataAddTime(md, PS_LIST_TAIL, field[i].name, 0, "", NULL);
+                } else {
+                    psTime *time = psTimeStrptime((char *)data, "%EY-%m-%d%t%T");
+                    if (!time) {
+                        psError(PS_ERR_UNKNOWN, true, "error parsing MySQL DateTime string");
+                        psFree(md);
+                        mysql_free_result(result);
+                        psFree(resultSet);
+                        return NULL;
+                    }
+                    psMetadataAddTime(md, PS_LIST_TAIL, field[i].name, 0, "", time);
+                    psFree(time);
                 }
-                psMetadataAddTime(md, PS_LIST_TAIL, field[i].name, 0, "", time);
-                psFree(time);
                 #if 0
                 // this is the procedure needed for stmt