X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fstrenc.c;h=ca5423cfbab59022afd6d503672b1cf81032284e;hb=467b5dfe2feee3b4c5d58244e4281af1fa235ca3;hp=b2a5d7e46aa5d0b056848fd9e4626ca52ced58bc;hpb=d6b5e2a238d13d70b620bd5e2a99609fbe153c11;p=mono.git

diff --git a/mono/utils/strenc.c b/mono/utils/strenc.c
index b2a5d7e46aa..ca5423cfbab 100644
--- a/mono/utils/strenc.c
+++ b/mono/utils/strenc.c
@@ -13,9 +13,23 @@
 
 #include "strenc.h"
 
-#undef DEBUG
+static const char trailingBytesForUTF8[256] = {
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,0,0
+};
 
-/* Tries to turn a NULL-terminated string into UTF16.
+/**
+ * mono_unicode_from_external:
+ * @in: pointers to the buffer.
+ * @bytes: number of bytes in the string.
+ *
+ * Tries to turn a NULL-terminated string into UTF16.
  *
  * First, see if it's valid UTF8, in which case just turn it directly
  * into UTF16.  Next, run through the colon-separated encodings in
@@ -26,7 +40,8 @@
  * Callers must free the returned string if not NULL. bytes holds the number
  * of bytes in the returned string, not including the terminator.
  */
-gunichar2 *mono_unicode_from_external (const gchar *in, gsize *bytes)
+gunichar2 *
+mono_unicode_from_external (const gchar *in, gsize *bytes)
 {
 	gchar *res=NULL;
 	gchar **encodings;
@@ -45,10 +60,6 @@ gunichar2 *mono_unicode_from_external (const gchar *in, gsize *bytes)
 	
 	encodings=g_strsplit (encoding_list, ":", 0);
 	for(i=0;encodings[i]!=NULL; i++) {
-#ifdef DEBUG
-		g_message (G_GNUC_PRETTY_FUNCTION ": Trying encoding [%s]",
-			   encodings[i]);
-#endif
 		/* "default_locale" is a special case encoding */
 		if(!strcmp (encodings[i], "default_locale")) {
 			gchar *utf8=g_locale_to_utf8 (in, -1, NULL, NULL, NULL);
@@ -58,7 +69,14 @@ gunichar2 *mono_unicode_from_external (const gchar *in, gsize *bytes)
 			}
 			g_free (utf8);
 		} else {
-			res=g_convert (in, -1, "UTF16", encodings[i], NULL, bytes, NULL);
+			/* Don't use UTF16 here. It returns the <FF FE> prepended to the string */
+			res = g_convert (in, strlen (in), "UTF8", encodings[i], NULL, bytes, NULL);
+			if (res != NULL) {
+				gchar *ptr = res;
+				res = (gchar *) g_utf8_to_utf16 (res, -1, NULL, &lbytes, NULL);
+				*bytes = (gsize) lbytes;
+				g_free (ptr);
+			}
 		}
 
 		if(res!=NULL) {
@@ -79,7 +97,11 @@ gunichar2 *mono_unicode_from_external (const gchar *in, gsize *bytes)
 	return(NULL);
 }
 
-/* Tries to turn a NULL-terminated string into UTF8.
+/**
+ * mono_utf8_from_external:
+ * @in: pointer to the string buffer.
+ *
+ * Tries to turn a NULL-terminated string into UTF8.
  *
  * First, see if it's valid UTF8, in which case there's nothing more
  * to be done.  Next, run through the colon-separated encodings in
@@ -111,10 +133,6 @@ gchar *mono_utf8_from_external (const gchar *in)
 	
 	encodings=g_strsplit (encoding_list, ":", 0);
 	for(i=0;encodings[i]!=NULL; i++) {
-#ifdef DEBUG
-		g_message (G_GNUC_PRETTY_FUNCTION ": Trying encoding [%s]",
-			   encodings[i]);
-#endif
 		
 		/* "default_locale" is a special case encoding */
 		if(!strcmp (encodings[i], "default_locale")) {
@@ -143,7 +161,11 @@ gchar *mono_utf8_from_external (const gchar *in)
 	return(NULL);
 }
 
-/* Turns NULL-terminated UTF16 into either UTF8, or the first
+/**
+ * mono_unicode_to_external:
+ * @uni: an UTF16 string to conver to an external representation.
+ *
+ * Turns NULL-terminated UTF16 into either UTF8, or the first
  * working item in MONO_EXTERNAL_ENCODINGS if set.  If no conversions
  * work, then UTF8 is returned.
  *
@@ -193,3 +215,153 @@ gchar *mono_unicode_to_external (const gunichar2 *uni)
 	return(utf8);
 }
 
+/**
+ * mono_utf8_validate_and_len
+ * @source: Pointer to putative UTF-8 encoded string.
+ *
+ * Checks @source for being valid UTF-8. @utf is assumed to be
+ * null-terminated.
+ *
+ * Return value: true if @source is valid.
+ * oEnd : will equal the null terminator at the end of the string if valid.
+ *            if not valid, it will equal the first charater of the invalid sequence.
+ * oLengh : will equal the length to @oEnd
+ **/
+gboolean
+mono_utf8_validate_and_len (const gchar *source, glong* oLength, const gchar** oEnd)
+{
+	gboolean retVal = TRUE;
+	gboolean lastRet = TRUE;
+	guchar* ptr = (guchar*) source;
+	guchar* srcPtr;
+	guint length;
+	guchar a;
+	*oLength = 0;
+	while (*ptr != 0) {
+		length = trailingBytesForUTF8 [*ptr] + 1;
+		srcPtr = (guchar*) ptr + length;
+		switch (length) {
+		default: retVal = FALSE;
+		/* Everything else falls through when "TRUE"... */
+		case 4: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+				if ((a == (guchar) 0xBF || a == (guchar) 0xBE) && *(srcPtr-1) == (guchar) 0xBF) {
+				if (*(srcPtr-2) == (guchar) 0x8F || *(srcPtr-2) == (guchar) 0x9F ||
+					*(srcPtr-2) == (guchar) 0xAF || *(srcPtr-2) == (guchar) 0xBF)
+					retVal = FALSE;
+				}
+		case 3: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+		case 2: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+
+		switch (*ptr) {
+		/* no fall-through in this inner switch */
+		case 0xE0: if (a < (guchar) 0xA0) retVal = FALSE; break;
+		case 0xED: if (a > (guchar) 0x9F) retVal = FALSE; break;
+		case 0xEF: if (a == (guchar)0xB7 && (*(srcPtr+1) > (guchar) 0x8F && *(srcPtr+1) < 0xB0)) retVal = FALSE;
+				   if (a == (guchar)0xBF && (*(srcPtr+1) == (guchar) 0xBE || *(srcPtr+1) == 0xBF)) retVal = FALSE; break;
+		case 0xF0: if (a < (guchar) 0x90) retVal = FALSE; break;
+		case 0xF4: if (a > (guchar) 0x8F) retVal = FALSE; break;
+		default:   if (a < (guchar) 0x80) retVal = FALSE;
+		}
+
+		case 1: if (*ptr >= (guchar ) 0x80 && *ptr < (guchar) 0xC2) retVal = FALSE;
+		}
+		if (*ptr > (guchar) 0xF4)
+			retVal = FALSE;
+		//If the string is invalid, set the end to the invalid byte.
+		if (!retVal && lastRet) {
+			if (oEnd != NULL)
+				*oEnd = (gchar*) ptr;
+			lastRet = FALSE;
+		}
+		ptr += length;
+		(*oLength)++;
+	}
+	if (retVal && oEnd != NULL)
+		*oEnd = (gchar*) ptr;
+	return retVal;
+}
+
+
+/**
+ * mono_utf8_validate_and_len_with_bounds
+ * @source: Pointer to putative UTF-8 encoded string.
+ * @max_bytes: Max number of bytes that can be decoded. This function returns FALSE if
+ * it needs to decode characters beyond that.
+ *
+ * Checks @source for being valid UTF-8. @utf is assumed to be
+ * null-terminated.
+ *
+ * Return value: true if @source is valid.
+ * oEnd : will equal the null terminator at the end of the string if valid.
+ *            if not valid, it will equal the first charater of the invalid sequence.
+ * oLengh : will equal the length to @oEnd
+ **/
+gboolean
+mono_utf8_validate_and_len_with_bounds (const gchar *source, glong max_bytes, glong* oLength, const gchar** oEnd)
+{
+	gboolean retVal = TRUE;
+	gboolean lastRet = TRUE;
+	guchar* ptr = (guchar*) source;
+	guchar *end = ptr + max_bytes;
+	guchar* srcPtr;
+	guint length;
+	guchar a;
+	*oLength = 0;
+
+	if (max_bytes < 1) {
+		if (oEnd)
+			*oEnd = (gchar*) ptr;
+		return FALSE;
+	}
+
+	while (*ptr != 0) {
+		length = trailingBytesForUTF8 [*ptr] + 1;
+		srcPtr = (guchar*) ptr + length;
+		
+		/* since *ptr is not zero we must ensure that we can decode the current char + the byte after
+		   srcPtr points to the first byte after the current char.*/
+		if (srcPtr >= end) {
+			retVal = FALSE;
+			break;
+		}
+		switch (length) {
+		default: retVal = FALSE;
+		/* Everything else falls through when "TRUE"... */
+		case 4: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+				if ((a == (guchar) 0xBF || a == (guchar) 0xBE) && *(srcPtr-1) == (guchar) 0xBF) {
+				if (*(srcPtr-2) == (guchar) 0x8F || *(srcPtr-2) == (guchar) 0x9F ||
+					*(srcPtr-2) == (guchar) 0xAF || *(srcPtr-2) == (guchar) 0xBF)
+					retVal = FALSE;
+				}
+		case 3: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+		case 2: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
+
+		switch (*ptr) {
+		/* no fall-through in this inner switch */
+		case 0xE0: if (a < (guchar) 0xA0) retVal = FALSE; break;
+		case 0xED: if (a > (guchar) 0x9F) retVal = FALSE; break;
+		case 0xEF: if (a == (guchar)0xB7 && (*(srcPtr+1) > (guchar) 0x8F && *(srcPtr+1) < 0xB0)) retVal = FALSE;
+				   if (a == (guchar)0xBF && (*(srcPtr+1) == (guchar) 0xBE || *(srcPtr+1) == 0xBF)) retVal = FALSE; break;
+		case 0xF0: if (a < (guchar) 0x90) retVal = FALSE; break;
+		case 0xF4: if (a > (guchar) 0x8F) retVal = FALSE; break;
+		default:   if (a < (guchar) 0x80) retVal = FALSE;
+		}
+
+		case 1: if (*ptr >= (guchar ) 0x80 && *ptr < (guchar) 0xC2) retVal = FALSE;
+		}
+		if (*ptr > (guchar) 0xF4)
+			retVal = FALSE;
+		//If the string is invalid, set the end to the invalid byte.
+		if (!retVal && lastRet) {
+			if (oEnd != NULL)
+				*oEnd = (gchar*) ptr;
+			lastRet = FALSE;
+		}
+		ptr += length;
+		(*oLength)++;
+	}
+	if (retVal && oEnd != NULL)
+		*oEnd = (gchar*) ptr;
+	return retVal;
+}
+