From: Antony Dovgal <tony2001@php.net>
Date: Tue, 15 Aug 2006 15:09:38 +0000 (+0000)
Subject: MFH: don't try to use "auto", "none" and "pass" charsets returned from mbstring
X-Git-Tag: php-5.2.0RC2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3c1722b0cd160f068df640957a42f5bc7ff366a;p=php

MFH: don't try to use "auto", "none" and "pass" charsets returned from mbstring
---

diff --git a/ext/standard/html.c b/ext/standard/html.c
index b1d05fd893..02b2608112 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -756,6 +756,15 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 			charset_hint = Z_STRVAL_P(uf_result);
 			len = Z_STRLEN_P(uf_result);
 			
+			if (len == 4) { /* sizeof(none|auto|pass)-1 */
+				if (!memcmp("pass", charset_hint, sizeof("pass") - 1) || 
+				    !memcmp("auto", charset_hint, sizeof("auto") - 1) || 
+				    !memcmp("none", charset_hint, sizeof("none") - 1)) {
+					
+					charset_hint = NULL;
+					len = 0;
+				}
+			}
 			goto det_charset;
 		}
 	}