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

[Marcus Boerger]

helly           Tue Jul 22 18:06:05 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/pgsql  pgsql.c 
  Log:
  MFH: The value might be a null pointer
  
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.19 php-src/ext/pgsql/pgsql.c:1.244.2.20
--- php-src/ext/pgsql/pgsql.c:1.244.2.19        Sun Jun 22 12:48:16 2003
+++ php-src/ext/pgsql/pgsql.c   Tue Jul 22 18:06:05 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: pgsql.c,v 1.244.2.19 2003/06/22 16:48:16 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.20 2003/07/22 22:06:05 helly Exp $ */
 
 #include <stdlib.h>
 
@@ -804,9 +804,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));
-       Z_TYPE_P(return_value) = IS_STRING;
+       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("");
+       }
 }
 /* }}} */
 



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