diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-01-20 11:02:49 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-01-20 11:02:49 +0000 |
| commit | 5fb6e0703f42e45dadf545432e7d966477f80a9c (patch) | |
| tree | 89dd916544dc6db762487f3ff2c9a2946adc6ae9 | |
| parent | 0621bcc9e1e66aaf8764c7a5f7e05687f3dd515d (diff) | |
| download | php-git-5fb6e0703f42e45dadf545432e7d966477f80a9c.tar.gz | |
MFH: fix #36096 (oci_result() returns garbage after oci_fetch() failed)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/oci8/oci8_statement.c | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -8,6 +8,8 @@ PHP NEWS MYSQLI_TYPE_NEWDECIMAL and MYSQLI_TYPE_BIT. FR #36007. (Georg) - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE on error. (Pierre) +- Fixed bug #36096 (oci_result() returns garbage after oci_fetch() failed). + (Tony) - Fixed bug #36071 (Engine Crash related with 'clone'). (Dmitry) - Fixed bug #36055 (possible OCI8 crash in multithreaded environment). (Tony) - Fixed bug #36046 (parse_ini_file() miscounts lines in multi-line values). diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index 397b1924d0..d2d3aab744 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -165,7 +165,6 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows TSRMLS_DC) /* this is exactly what we requested */ return 0; } - return 1; } @@ -509,7 +508,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode TSRMLS_DC) outcol->storage_size4 *= 3; dynamic = OCI_DEFAULT; - buf = outcol->data = (text *) emalloc(outcol->storage_size4); + buf = outcol->data = (text *) ecalloc(1, outcol->storage_size4); break; } @@ -1020,6 +1019,10 @@ php_oci_out_column *php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAME if (!statement) { return NULL; } + + if (!statement->has_data) { + return NULL; + } if (Z_TYPE_P(column_index) == IS_STRING) { column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), Z_STRLEN_P(column_index) TSRMLS_CC); |