aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-01-03 18:41:11 +1000
committerinmarket <andrewh@inmarket.com.au>2015-01-03 18:41:11 +1000
commit9ddf7c42849229e041a27bb9d46cf16c37eaae05 (patch)
tree7db2e810d8f7792d5bce303dc3566523118c726e /src
parent100e74d8e070774573a54f2657ac9c097f546949 (diff)
downloaduGFX-9ddf7c42849229e041a27bb9d46cf16c37eaae05.tar.gz
uGFX-9ddf7c42849229e041a27bb9d46cf16c37eaae05.tar.bz2
uGFX-9ddf7c42849229e041a27bb9d46cf16c37eaae05.zip
Protect against NULL strings
Diffstat (limited to 'src')
-rw-r--r--src/gdisp/gdisp_gdisp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gdisp/gdisp_gdisp.c b/src/gdisp/gdisp_gdisp.c
index e19c6d73..99861571 100644
--- a/src/gdisp/gdisp_gdisp.c
+++ b/src/gdisp/gdisp_gdisp.c
@@ -3312,6 +3312,9 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
}
coord_t gdispGetStringWidth(const char* str, font_t font) {
+ if (!str)
+ return 0;
+
/* No mutex required as we only read static data */
return mf_get_string_width(font, str, 0, 0);
}