update

[l4.git] / l4 / pkg / mag-gfx / include / font

diff --git a/l4/pkg/mag-gfx/include/font b/l4/pkg/mag-gfx/include/font
index 3045dddca1616506402ebed9d13ed3695090ab36..a17d7010a385b4d836a1879d5bc48658b5e13f5e 100644 (file)
--- a/l4/pkg/mag-gfx/include/font
+++ b/l4/pkg/mag-gfx/include/font
@@ -38,9 +38,12 @@ struct Font
    */
   int str_w(char const *_str) const
   {
+    if (!_str)
+      return 0;
+
     unsigned char const *str = (unsigned char const *)_str;
     int res = 0;
-    for (; str && *str; ++str)
+    for (; *str; ++str)
       res += wtab[*str];
 
     return res;
@@ -48,9 +51,12 @@ struct Font
 
   int str_w(char const *_str, int len) const
   {
+    if (!_str)
+      return 0;
+
     unsigned char const *str = (unsigned char const *)_str;
     int res = 0;
-    for (; str && *str && len; ++str, --len)
+    for (; *str && len; ++str, --len)
       res += wtab[*str];
 
     return res;