From 26f129eff240bac8a2ac013413f71d042aa95576 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Tue, 9 Apr 2013 18:19:21 -0400
Subject: [PATCH] Fix #9649.

- Fix regression introduced in hrev45462: BUnicodeChar::FromUTF8 was no
longer advancing the passed in string pointer, resulting in endless
loops in functions relying on that behavior such as the locale kit's
CoerceFormatTo*() functions.
---
 src/kits/locale/UnicodeChar.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/kits/locale/UnicodeChar.cpp b/src/kits/locale/UnicodeChar.cpp
index 242e16d5c8..eed3b9c611 100644
--- a/src/kits/locale/UnicodeChar.cpp
+++ b/src/kits/locale/UnicodeChar.cpp
@@ -253,7 +253,9 @@ BUnicodeChar::FromUTF8(const char **in)
 {
 	int i = 0;
 	uint32 c = 0;
-	U8_GET_UNSAFE(*in, i, c);
+	U8_NEXT_UNSAFE(*in, i, c);
+	*in += i;
+
 	return c;
 }