cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re
| From: | Ilia Alshanetsky | Date: | Thu, 23 Nov 2006 14:41:52 +0000 |
| Subject: | cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41701@lists.php.net to get a copy of this message | ||
iliaa Thu Nov 23 14:41:52 2006 UTC
Modified files:
/php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re
Log:
MFB: Fixed a possible crash
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.43&r2=1.44&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.43 php-src/ext/pdo/pdo_sql_parser.c:1.44
--- php-src/ext/pdo/pdo_sql_parser.c:1.43 Sun Nov 12 17:56:50 2006
+++ php-src/ext/pdo/pdo_sql_parser.c Thu Nov 23 14:41:51 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sun Nov 12 12:56:00 2006 */
+/* Generated by re2c 0.10.6 on Thu Nov 23 09:42:00 2006 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.43 2006/11/12 17:56:50 iliaa Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.44 2006/11/23 14:41:51 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.33&r2=1.34&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.33 php-src/ext/pdo/pdo_sql_parser.re:1.34
--- php-src/ext/pdo/pdo_sql_parser.re:1.33 Sun Nov 12 17:49:52 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Thu Nov 23 14:41:51 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.33 2006/11/12 17:49:52 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.34 2006/11/23 14:41:51 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;