cvs: php-src /ext/standard html.c
| From: | Ilia Alshanetsky | Date: | Sun, 01 May 2005 19:48:56 +0000 |
| Subject: | cvs: php-src /ext/standard html.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31693@lists.php.net to get a copy of this message | ||
iliaa Sun May 1 15:48:56 2005 EDT
Modified files:
/php-src/ext/standard html.c
Log:
Fixed bug #32608 (html_entity_decode() converts single quotes even if
ENT_NOQUOTES is given).
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.106&r2=1.107&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.106 php-src/ext/standard/html.c:1.107
--- php-src/ext/standard/html.c:1.106 Thu Mar 10 06:19:32 2005
+++ php-src/ext/standard/html.c Sun May 1 15:48:55 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.106 2005/03/10 11:19:32 jorton Exp $ */
+/* $Id: html.c,v 1.107 2005/05/01 19:48:55 iliaa Exp $ */
/*
* HTML entity resources:
@@ -996,7 +996,11 @@
if ((code >= 0x80 && code < 0xa0) || code > 0xff) {
invalid_code = 1;
} else {
- *(q++) = code;
+ if (code == 39 || !quote_style) {
+ invalid_code = 1;
+ } else {
+ *(q++) = code;
+ }
}
break;