cvs: php-src(PHP_4_3) /ext/oci8 oci8.c
| From: | Antony Dovgal | Date: | Thu, 28 Apr 2005 14:13:09 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31651@lists.php.net to get a copy of this message | ||
tony2001 Thu Apr 28 10:13:09 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/oci8 oci8.c
Log:
MFH: handle unsupported datatypes and prevent segfault
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.17&r2=1.183.2.18&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.17 php-src/ext/oci8/oci8.c:1.183.2.18
--- php-src/ext/oci8/oci8.c:1.183.2.17 Thu Jan 20 13:44:10 2005
+++ php-src/ext/oci8/oci8.c Thu Apr 28 10:13:08 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.183.2.17 2005/01/20 18:44:10 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.18 2005/04/28 14:13:08 tony2001 Exp $ */
/* TODO list:
*
@@ -641,7 +641,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.17 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.18 $");
#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 );
@@ -2975,6 +2975,10 @@
}
value_sz = sizeof(void*);
break;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or unsupported datatype given:
%u", ocitype);
+ RETURN_FALSE;
+ break;
}
if ((ocitype == SQLT_CHR) && (value_sz == -1)) {