cvs: php4 /ext/oci8 oci8.c

From: Date: Sun, 14 Apr 2002 18:27:28 +0000
Subject: cvs: php4 /ext/oci8 oci8.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-11139@lists.php.net to get a copy of this message
thies Sun Apr 14 14:27:28 2002 EDT Modified files: /php4/ext/oci8 oci8.c Log: fix crash bug introduced by last commit Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.172 php4/ext/oci8/oci8.c:1.173 --- php4/ext/oci8/oci8.c:1.172 Sat Apr 13 14:58:18 2002 +++ php4/ext/oci8/oci8.c Sun Apr 14 14:27:27 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.172 2002/04/13 18:58:18 thies Exp $ */ +/* $Id: oci8.c,v 1.173 2002/04/14 18:27:27 thies Exp $ */ /* TODO list: * @@ -631,7 +631,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.172 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.173 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -697,7 +697,9 @@ if (bind->indicator == -1) { /* NULL */ zval *val = bind->zval; - *Z_STRVAL_P(val) = '\0'; /* XXX avoid warning in debug mode */ + if (Z_TYPE_P(val) == IS_STRING && (Z_STRVAL_P(val) != empty_string)) { + *Z_STRVAL_P(val) = '\0'; /* XXX avoid warning in debug mode */ + } zval_dtor(val); ZVAL_NULL(val); } else if (Z_TYPE_P(bind->zval) == IS_STRING && (Z_STRVAL_P(bind->zval) != empty_string)) {

« previous php.cvs (#11139) next »