From 99642e2a99a0a94e7dad886e323f924ce8af0a36 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 30 Jul 2013 14:19:50 +1000
Subject: [PATCH] From mcufont upstream: Fix inconsistency between UTF8 and
 other encodings

---
 src/gdisp/mcufont/mf_encoding.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gdisp/mcufont/mf_encoding.c b/src/gdisp/mcufont/mf_encoding.c
index 2c8abf3a..e0c89355 100644
--- a/src/gdisp/mcufont/mf_encoding.c
+++ b/src/gdisp/mcufont/mf_encoding.c
@@ -75,11 +75,16 @@ void mf_rewind(mf_str *str)
 
 #else
 
-mf_char mf_getchar(mf_str *str) {
-	return *(*str)++;
+mf_char mf_getchar(mf_str *str)
+{
+    if (!(**str))
+        return 0;
+    else
+        return *(*str)++;
 }
 
-void mf_rewind(mf_str *str) {
+void mf_rewind(mf_str *str)
+{
 	(*str)--;
 }