iliaa Sun Oct 9 15:00:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/pdo_dblib dblib_driver.c
Log:
MFH: Fixed bug #34777 (Crash in dblib when fetching non-existent error info).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.104&r2=1.2027.2.105&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.104 php-src/NEWS:1.2027.2.105
--- php-src/NEWS:1.2027.2.104 Sun Oct 9 10:39:59 2005
+++ php-src/NEWS Sun Oct 9 15:00:33 2005
@@ -47,6 +47,7 @@
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
- Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg)
+- Fixed bug #34777 (Crash in dblib when fetching non-existent error info).
(Ilia)
- Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick)
- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.9
php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.1
--- php-src/ext/pdo_dblib/dblib_driver.c:1.9 Wed Jul 20 01:27:27 2005
+++ php-src/ext/pdo_dblib/dblib_driver.c Sun Oct 9 15:00:34 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dblib_driver.c,v 1.9 2005/07/20 05:27:27 wez Exp $ */
+/* $Id: dblib_driver.c,v 1.9.2.1 2005/10/09 19:00:34 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -61,7 +61,9 @@
add_next_index_string(info, message, 0);
add_next_index_long(info, einfo->oserr);
add_next_index_long(info, einfo->severity);
- add_next_index_string(info, einfo->oserrstr, 1);
+ if (einfo->oserrstr) {
+ add_next_index_string(info, einfo->oserrstr, 1);
+ }
return 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
