From 9cd79b40c580360effb3d1fbca9c2c739ffbd6f5 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Fri, 16 Apr 2010 20:36:40 +0000 Subject: [PATCH] Fixed Bug #51577 (Uninitialized memory reference with oci_bind_array_by_name) --- ext/oci8/oci8_statement.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index fa5d9155921..f7fda511a75 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -809,8 +809,16 @@ void php_oci_statement_free(php_oci_statement *statement TSRMLS_DC) int php_oci_bind_pre_exec(void *data, void *result TSRMLS_DC) { php_oci_bind *bind = (php_oci_bind *) data; + *(int *)result = 0; + if (Z_TYPE_P(bind->zval) == IS_ARRAY) { + /* These checks are currently valid for oci_bind_by_name, not + * oci_bind_array_by_name. Also bind->type and + * bind->indicator are not used for oci_bind_array_by_name. + */ + return 0; + } switch (bind->type) { case SQLT_NTY: case SQLT_BFILEE: @@ -850,9 +858,8 @@ int php_oci_bind_pre_exec(void *data, void *result TSRMLS_DC) } break; } - - /* reset all bind stuff to a normal state..-. */ + /* reset all bind stuff to a normal state..-. */ bind->indicator = 0; return 0;