iliaa Thu Jan 15 21:29:51 2004 EDT
Added files:
/php-src/ext/pcre/tests bug26927.phpt
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
Fixed Bug #26927 (preg_quote() does not escape \0).
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.150 php-src/ext/pcre/php_pcre.c:1.151
--- php-src/ext/pcre/php_pcre.c:1.150 Thu Jan 8 03:16:45 2004
+++ php-src/ext/pcre/php_pcre.c Thu Jan 15 21:29:49 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.150 2004/01/08 08:16:45 andi Exp $ */
+/* $Id: php_pcre.c,v 1.151 2004/01/16 02:29:49 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1388,6 +1388,11 @@
*q++ = c;
break;
+ case '\0':
+ *q++ = '\\';
+ *q++ = '0';
+ break;
+
default:
if (quote_delim && c == delim_char)
*q++ = '\\';
Index: php-src/ext/pcre/tests/bug26927.phpt
+++ php-src/ext/pcre/tests/bug26927.phpt
--TEST--
Bug #26927 (preg_quote() does not escape \0)
--FILE--
<?php
$str = "a\000b";
$str_quoted = preg_quote($str);
var_dump(preg_match("!{$str_quoted}!", $str), $str_quoted);
?>
--EXPECT--
int(1)
string(4) "a\0b"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
