git-svn-id: svn://db.shs.com.ru/pip@555 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src_main/core/pichar.cpp

@@ -20,8 +20,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <iostream>
-#include <string.h>
+#include "piincludes_p.h"
 #include "pibytearray.h"
 #ifdef PIP_ICU
 #  include "unicode/ucnv.h"
@@ -115,9 +114,13 @@ PIChar PIChar::fromUTF8(const char * c) {
 #endif
 //#ifdef ANDROID
 	wchar_t wc(0);
-	mbstate_t s;
-	mbrtowc(&wc, c, 4, &s);
-	ret.ch = wc;
+	mbtowc(0, 0, 0); // reset mbtowc
+	//mbstate_t s;
+	//mbrtowc(&wc, c, 4, &s);
+	int sz = 0;
+	sz = mbtowc(&wc, c, sizeof(ushort));
+	if (sz < 1 || sz > (int)sizeof(ushort)) ret.ch = 0;
+	else ret.ch = wc;
 	return ret;
 //#endif
 //	ret.ch = *(ushort*)c;