iliaa Thu Nov 23 14:41:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re
Log:
Fixed a possible crash
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.2&r2=1.35.2.6.2.3&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.2
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.3
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.2 Sun Nov 12 17:55:44 2006
+++ php-src/ext/pdo/pdo_sql_parser.c Thu Nov 23 14:41:35 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sun Nov 12 12:53:54 2006 */
+/* Generated by re2c 0.10.6 on Thu Nov 23 09:39:04 2006 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.2 2006/11/12 17:55:44 iliaa Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.3 2006/11/23 14:41:35 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -412,11 +412,14 @@
/* bork */
ret = -1;
strcpy(stmt->error_code, stmt->dbh->error_code);
- efree(buf);
+ if (buf) {
+ efree(buf);
+ }
goto clean_up;
}
- efree(buf);
-
+ if (buf) {
+ efree(buf);
+ }
} else {
pdo_raise_impl_error(stmt->dbh,
stmt, "HY105", "Expected a stream resource" TSRMLS_CC);
ret = -1;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.1&r2=1.28.2.4.2.2&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.1
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.2
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.1 Sun Nov 12 17:49:19 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Thu Nov 23 14:41:35 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.1 2006/11/12 17:49:19 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.2 2006/11/23 14:41:35 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -192,11 +192,14 @@
/* bork */
ret = -1;
strcpy(stmt->error_code, stmt->dbh->error_code);
- efree(buf);
+ if (buf) {
+ efree(buf);
+ }
goto clean_up;
}
- efree(buf);
-
+ if (buf) {
+ efree(buf);
+ }
} else {
pdo_raise_impl_error(stmt->dbh,
stmt, "HY105", "Expected a stream resource" TSRMLS_CC);
ret = -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
