From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 25 Oct 2010 16:46:55 +0000 (+0000)
Subject: Code cleanup & CS
X-Git-Tag: php-5.4.0alpha1~191^2~761
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18fa045e75cc596d401017397402e578bc6f7ec0;p=php

Code cleanup & CS
---

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 8cf4fe45be..354e18bfec 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1307,9 +1307,11 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size
 		}
 	}
 
-	maxlen = 2 * oldlen;
-	if (maxlen < 128)
-		maxlen = 128;
+	if (oldlen < 64) {
+		maxlen = 128;	
+	} else {
+		maxlen = 2 * oldlen;
+	}
 	replaced = emalloc(maxlen);
 	len = 0;
 	cursor = 0;
@@ -1322,8 +1324,9 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size
 
 		/* guarantee we have at least 40 bytes to write.
 		 * In HTML5, entities may take up to 33 bytes */
-		if (len + 40 > maxlen)
+		if (len + 40 > maxlen) {
 			replaced = erealloc(replaced, maxlen += 128);
+		}
 
 		if (status == FAILURE) {
 			/* invalid MB sequence */
@@ -1335,9 +1338,6 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size
 				continue;
 			} else {
 				efree(replaced);
-				if(!PG(display_errors)) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid multibyte sequence in argument");
-				}
 				*newlen = 0;
 				return STR_EMPTY_ALLOC();
 			}