cvs: php4 /ext/oci8 oci8.c php_oci8.h

thies Sun Jul 8 08:37:09 2001 EDT Modified files: /php4/ext/oci8 oci8.c php_oci8.h Log: @ - Make sure that OCI8 outbound variables are always zero-terminated. (Thies) Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.130 php4/ext/oci8/oci8.c:1.131 --- php4/ext/oci8/oci8.c:1.130 Tue Jun 19 12:03:33 2001 +++ php4/ext/oci8/oci8.c Sun Jul 8 08:37:07 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.130 2001/06/19 16:03:33 andi Exp $ */ +/* $Id: oci8.c,v 1.131 2001/07/08 12:37:07 thies Exp $ */ /* TODO list: * @@ -563,7 +563,7 @@ { oci_debug("START php_rshutdown_oci"); -#if 0 +#if 0 /* XXX free all statements, rollback all outstanding transactions */ zend_hash_apply(OCI(user),(int (*)(void *))_session_cleanup); @@ -581,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.130 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.131 $"); #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 ); @@ -649,7 +649,11 @@ zval *val = bind->zval; zval_dtor(val); ZVAL_NULL(val); + } else if (bind->zval->type == IS_STRING) { + bind->zval->value.str.val = realloc(bind->zval->value.str.val, bind->zval->value.str.len+1); + bind->zval->value.str.val[ bind->zval->value.str.len ] = '\0'; } + return 0; } Index: php4/ext/oci8/php_oci8.h diff -u php4/ext/oci8/php_oci8.h:1.17 php4/ext/oci8/php_oci8.h:1.18 --- php4/ext/oci8/php_oci8.h:1.17 Sun May 27 20:16:28 2001 +++ php4/ext/oci8/php_oci8.h Sun Jul 8 08:37:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8.h,v 1.17 2001/05/28 00:16:28 sniper Exp $ */ +/* $Id: php_oci8.h,v 1.18 2001/07/08 12:37:08 thies Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -181,6 +181,8 @@ HashTable *user; OCIEnv *pEnv; + + int in_call; } php_oci_globals; extern zend_module_entry oci8_module_entry;