You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by td...@apache.org on 2008/06/18 04:45:59 UTC

svn commit: r669062 - /apr/apr-util/trunk/dbd/apr_dbd_odbc.c

Author: tdonovan
Date: Tue Jun 17 19:45:59 2008
New Revision: 669062

URL: http://svn.apache.org/viewvc?rev=669062&view=rev
Log:
make test for NULL or error (-1) value pointer safe for 64-bit

Modified:
    apr/apr-util/trunk/dbd/apr_dbd_odbc.c

Modified: apr/apr-util/trunk/dbd/apr_dbd_odbc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_odbc.c?rev=669062&r1=669061&r2=669062&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_odbc.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_odbc.c Tue Jun 17 19:45:59 2008
@@ -1311,10 +1311,11 @@
 
     p = odbc_get(row, col, SQL_C_CHAR);
 
-    if ((signed int) p > 0)
-        return apr_pstrdup(row->pool, p);   /* row pool lifetime */
+    /* NULL or invalid (-1) */
+    if (p == NULL || p == (void *) -1)
+        return p;     
     else
-        return p;     /* NULL or invalid (-1) */
+        return apr_pstrdup(row->pool, p);   
 }
 
 /** error: get current error message (if any) **/