iliaa Tue Nov 11 22:05:25 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
/php-src NEWS
Log:
Fixed bug #26201 (crash in ibase_trans() on invalid link handle).
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.22
php-src/ext/interbase/interbase.c:1.91.2.23
--- php-src/ext/interbase/interbase.c:1.91.2.22 Wed Sep 3 11:22:24 2003
+++ php-src/ext/interbase/interbase.c Tue Nov 11 22:05:23 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.91.2.22 2003/09/03 15:22:24 abies Exp $ */
+/* $Id: interbase.c,v 1.91.2.23 2003/11/12 03:05:23 iliaa Exp $ */
/* TODO: Arrays, roles?
@@ -624,7 +624,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.22 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.23 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -1493,7 +1493,7 @@
zval ***args;
char tpb[20], *tpbp = NULL;
long trans_argl = 0;
- int tpb_len = 0, argn, link_id, trans_n = 0, i;
+ int tpb_len = 0, argn, link_id = 0, trans_n = 0, i;
ibase_db_link *ib_link;
ibase_tr_link *ib_trans;
@@ -1528,7 +1528,7 @@
efree(args);
}
- if (argn < 2) {
+ if (!link_id) {
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id,
"InterBase link", le_link, le_plink);
}
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.465 php-src/NEWS:1.1247.2.466
--- php-src/NEWS:1.1247.2.465 Tue Nov 11 21:58:36 2003
+++ php-src/NEWS Tue Nov 11 22:05:24 2003
@@ -3,6 +3,7 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26201 (crash in ibase_trans() on invalid link handle). (Ilia)
- Fixed bug #26198 (strtotime() handling of M/F Y date format). (Ilia)
- Fixed bug #26176 (Fixed handling of numeric keys in INI files). (Ilia)
- Fixed bug #26168 (shtool availability check in phpize).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
