iliaa Mon Dec 4 00:38:46 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re
/php-src NEWS
Log:
Fixed bug #39483 (Problem with handling of \ char in prepared statements).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.4&r2=1.35.2.6.2.5&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.4
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.5
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.4 Sun Dec 3 23:27:44 2006
+++ php-src/ext/pdo/pdo_sql_parser.c Mon Dec 4 00:38:46 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sun Dec 3 18:24:46 2006 */
+/* Generated by re2c 0.10.6 on Sun Dec 3 19:05:06 2006 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.4 2006/12/03 23:27:44 iliaa Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.5 2006/12/04 00:38:46 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -232,8 +232,8 @@
++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
- if(yych == '\'') goto yy23;
- goto yy25;
+ if(yych <= 0x00) goto yy25;
+ goto yy23;
yy27:
yych = *++YYCURSOR;
goto yy22;
@@ -274,8 +274,8 @@
++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
- if(yych == '"') goto yy32;
- goto yy25;
+ if(yych <= 0x00) goto yy25;
+ goto yy32;
yy35:
++YYCURSOR;
yych = *YYCURSOR;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.3&r2=1.28.2.4.2.4&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.3
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.4
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.3 Sun Dec 3 23:27:44 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Mon Dec 4 00:38:46 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.3 2006/12/03 23:27:44 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.4 2006/12/04 00:38:46 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -55,8 +55,8 @@
*/
/*!re2c
- (["] (ESCQQ|ANYNOEOF\[\\"])* ["]) {
RET(PDO_PARSER_TEXT); }
- (['] (ESCQ|ANYNOEOF\[\\'])* [']) {
RET(PDO_PARSER_TEXT); }
+ (["] (ESCQQ|[\\]ANYNOEOF|ANYNOEOF\[\\"])* ["]) {
RET(PDO_PARSER_TEXT); }
+ (['] (ESCQ|[\\]ANYNOEOF|ANYNOEOF\[\\'])* [']) {
RET(PDO_PARSER_TEXT); }
SPECIALS{2,}
{ RET(PDO_PARSER_TEXT); }
BINDCHR
{ RET(PDO_PARSER_BIND); }
QUESTION
{ RET(PDO_PARSER_BIND_POS); }
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.394&r2=1.2027.2.547.2.395&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.394 php-src/NEWS:1.2027.2.547.2.395
--- php-src/NEWS:1.2027.2.547.2.394 Sun Dec 3 21:27:35 2006
+++ php-src/NEWS Mon Dec 4 00:38:46 2006
@@ -82,6 +82,8 @@
ZEND_MM_ALIGNED_MIN_HEADER_SIZE). (wharmby at uk dot ibm dot com, Dmitry)
- Fixed bug #39527 (Failure to retrieve results when multiple unbuffered,
prepared statements are used in pdo_mysql). (Ilia)
+- Fixed bug #39483 (Problem with handling of \ char in prepared statements).
+ (Ilia, suhachov at gmail dot com)
- Fixed bug #39458 (ftp_nlist() returns false on empty dirs). (Nuno)
- Fixed bug #39454 (Returning a SOAP array segfaults PHP). (Dmitry)
- Fixed bug #39445 (Calling debug_backtrace() in the __toString() function
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
