From e4e26de687f1c3a5dbaa365b514e4e6717f360d3 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Wed, 13 Jul 2011 00:05:03 +0200
Subject: [PATCH] Fix warnings (and sanity-check for 0-bytes in utf8-strings

---
 firmware/lcd/render.c | 17 ++++++++---------
 firmware/lcd/render.h |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/firmware/lcd/render.c b/firmware/lcd/render.c
index c8ded05..c332b23 100644
--- a/firmware/lcd/render.c
+++ b/firmware/lcd/render.c
@@ -141,24 +141,23 @@ int DoChar(int sx, int sy, int c){
 
 #define UTF8
 // decode 2 and 4-byte utf-8 strings.
-#define UT2(a,b)   ( ((a&31)<<6)  + (b&63) )
-#define UT3(a,b,c) ( ((a&15)<<12) + ((b&63)<<6) + (c&63) )
+#define UT2(a)   ( ((a[0]&31)<<6)  + (a[1]&63) )
+#define UT3(a)   ( ((a[0]&15)<<12) + ((a[1]&63)<<6) + (a[2]&63) )
 
-int DoString(int sx, int sy, char *s){
-	char *c;
+int DoString(int sx, int sy, const char *s){
+	const char *c;
 	int uc;
 	for(c=s;*c!=0;c++){
 #ifdef UTF8
 		/* will b0rk on non-utf8 */
-		if((*c&(128+64+32))==(128+64)){
-			uc=UT2(*c,*(++c));
+		if((*c&(128+64+32))==(128+64) && c[1]!=0){
+			uc=UT2(c); c+=1;
 			sx=DoChar(sx,sy,uc);
-		}else if( (*c&(128+64+32+16))==(128+64+32)){
-			uc=UT3(*c,*(++c),*(++c));
+		}else if( (*c&(128+64+32+16))==(128+64+32) && c[1]!=0 && c[2] !=0){
+			uc=UT3(c); c+=2;
 			sx=DoChar(sx,sy,uc);
 		}else
 #endif
-
 		sx=DoChar(sx,sy,*c);
 	};
 	return sx;
diff --git a/firmware/lcd/render.h b/firmware/lcd/render.h
index 7409174..04f7d47 100644
--- a/firmware/lcd/render.h
+++ b/firmware/lcd/render.h
@@ -27,7 +27,7 @@
 */
 
 int DoChar(int sx, int sy, int c);
-int DoString(int sx, int sy, char *s);
+int DoString(int sx, int sy, const char *s);
 int DoInt(int sx, int sy, int num);
 int DoIntX(int sx, int sy, unsigned int num);