cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re

felipe Thu Nov 13 13:07:50 2008 UTC Modified files: /php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re Log: - Fixed invalid reads http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.59&r2=1.60&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.59 php-src/ext/pdo/pdo_sql_parser.c:1.60 --- php-src/ext/pdo/pdo_sql_parser.c:1.59 Thu Oct 23 18:22:18 2008 +++ php-src/ext/pdo/pdo_sql_parser.c Thu Nov 13 13:07:50 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Thu Oct 23 16:16:52 2008 */ +/* Generated by re2c 0.13.6.dev on Thu Nov 13 11:03:30 2008 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.c,v 1.59 2008/10/23 18:22:18 felipe Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.60 2008/11/13 13:07:50 felipe Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -572,7 +572,7 @@ snprintf(idxbuf, sizeof(idxbuf), tmpl, bind_no++); } else { memset(idxbuf, 0, sizeof(idxbuf)); - memcpy(idxbuf, p, sizeof(idxbuf)); + memcpy(idxbuf, p, strlen(p)); skip_map = 1; } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.46&r2=1.47&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.46 php-src/ext/pdo/pdo_sql_parser.re:1.47 --- php-src/ext/pdo/pdo_sql_parser.re:1.46 Thu Oct 23 18:22:18 2008 +++ php-src/ext/pdo/pdo_sql_parser.re Thu Nov 13 13:07:50 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.re,v 1.46 2008/10/23 18:22:18 felipe Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.47 2008/11/13 13:07:50 felipe Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -321,7 +321,7 @@ snprintf(idxbuf, sizeof(idxbuf), tmpl, bind_no++); } else { memset(idxbuf, 0, sizeof(idxbuf)); - memcpy(idxbuf, p, sizeof(idxbuf)); + memcpy(idxbuf, p, strlen(p)); skip_map = 1; }