[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

[Marcus Boerger]

helly           Tue Jul 22 18:05:46 2003 EDT

  Modified files:              
    /php-src/ext/pgsql  pgsql.c 
  Log:
  The value might be a null pointer
  
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.282 php-src/ext/pgsql/pgsql.c:1.283
--- php-src/ext/pgsql/pgsql.c:1.282     Tue Jul 22 17:12:32 2003
+++ php-src/ext/pgsql/pgsql.c   Tue Jul 22 18:05:46 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: pgsql.c,v 1.282 2003/07/22 21:12:32 helly Exp $ */
+/* $Id: pgsql.c,v 1.283 2003/07/22 22:05:46 helly Exp $ */
 
 #include <stdlib.h>
 
@@ -834,8 +834,13 @@
                default:
                        RETURN_FALSE;
        }
-       Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-       Z_STRVAL_P(return_value) = (char *) estrdup(Z_STRVAL_P(return_value));
+       if (Z_STRVAL_P(return_value)) {
+               Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+               Z_STRVAL_P(return_value) = (char *) estrdup(Z_STRVAL_P(return_value));
+       } else {
+               Z_STRLEN_P(return_value) = 0;
+               Z_STRVAL_P(return_value) = (char *) estrdup("");
+       }
        Z_TYPE_P(return_value) = IS_STRING;
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php