diff options
Diffstat (limited to 'ext/standard/html.c')
| -rw-r--r-- | ext/standard/html.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index 14b4fab941..a32886617b 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -485,7 +485,6 @@ struct basic_entities_dec { #define CHECK_LEN(pos, chars_need) \ if((str_len - (pos)) < chars_need) { \ - *newpos = pos; \ *status = FAILURE; \ return 0; \ } @@ -528,11 +527,6 @@ inline static unsigned short get_next_char(enum entity_charset charset, do { if (this_char < 0x80) { more = 0; - if(stat) { - /* we didn't finish the UTF sequence correctly */ - --pos; - *status = FAILURE; - } break; } else if (this_char < 0xc0) { switch (stat) { @@ -1137,9 +1131,6 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, int oldlen, int *ne if(status == FAILURE) { /* invalid MB sequence */ - if (quote_style & ENT_HTML_IGNORE_ERRORS) { - continue; - } efree(replaced); if(!PG(display_errors)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid multibyte sequence in argument"); @@ -1298,7 +1289,6 @@ void register_html_constants(INIT_FUNC_ARGS) REGISTER_LONG_CONSTANT("ENT_COMPAT", ENT_COMPAT, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ENT_QUOTES", ENT_QUOTES, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ENT_NOQUOTES", ENT_NOQUOTES, CONST_PERSISTENT|CONST_CS); - REGISTER_LONG_CONSTANT("ENT_IGNORE", ENT_IGNORE, CONST_PERSISTENT|CONST_CS); } /* }}} */ @@ -1381,7 +1371,7 @@ done: PHP_FUNCTION(html_entity_decode) { char *str, *hint_charset = NULL; - int str_len, hint_charset_len = 0, len; + int str_len, hint_charset_len, len; long quote_style = ENT_COMPAT; char *replaced; |