From 0eb2aab0583d6443865337b0a42b18cee233f494 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Fri, 17 Apr 2015 02:01:32 +0800
Subject: avoid possible dead loop for invalid utf8

Change-Id: Ida48b7ff119030312836aa109072ac4de7c5b9d6
---
 minuitwrp/truetype.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/minuitwrp/truetype.c b/minuitwrp/truetype.c
index a286449ed..8f62ff26b 100644
--- a/minuitwrp/truetype.c
+++ b/minuitwrp/truetype.c
@@ -120,9 +120,6 @@ static inline uint32_t fnv_hash_add(uint32_t cur_hash, uint32_t word)
 
 int utf8_to_unicode(unsigned char* pIn, unsigned int *pOut)
 {
-    if(pIn == NULL || pOut == NULL)
-        return 0;
-
     int utf_bytes = 1;
     unsigned int unicode = 0;
     unsigned char tmp;
@@ -139,7 +136,11 @@ int utf8_to_unicode(unsigned char* pIn, unsigned int *pOut)
         while((tmp & 0xC0) == 0xC0)
         {
             utf_bytes ++;
-            if(utf_bytes > 6) return 0;
+            if(utf_bytes > 6)
+            {
+                *pOut = tmp;
+                return 1;
+            }
             tmp = 0xFF & (tmp << 1);
             total_bits += 6;
             high_bit_mask >>= 1;
-- 
cgit v1.2.3