cvs: php-src(PHP_4_3) /ext/oci8 oci8.c

tony2001 Sun Oct 10 11:06:20 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/oci8 oci8.c Log: MFH: fix possible segfault http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.14&r2=1.183.2.15&ty=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.183.2.14 php-src/ext/oci8/oci8.c:1.183.2.15 --- php-src/ext/oci8/oci8.c:1.183.2.14 Tue Sep 28 13:28:27 2004 +++ php-src/ext/oci8/oci8.c Sun Oct 10 11:06:20 2004 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.183.2.14 2004/09/28 17:28:27 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.183.2.15 2004/10/10 15:06:20 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.14 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.15 $"); #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 ); @@ -2598,7 +2598,7 @@ list_entry *le = (list_entry *) data; if (Z_TYPE_P(le) == le_session) { oci_server *server = ((oci_session*) le->ptr)->server; - if (server->is_open == 2) + if (server && server->is_open == 2) return 1; } return 0;