uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixing possible crash when GDISP_NEED_TEXT_WORDWRAP is enabled.

Browse Source
This commit is contained in:
Joel Bodenmann 2016-08-13 00:49:19 +02:00
parent 05e2969633
commit b9b555eae2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/releases.txt
View File

@ -7,6 +7,7 @@
FEATURE: Added EXC7200 driver FEATURE: Added EXC7200 driver
FEATURE: Added STM32F439i-EVAL board files FEATURE: Added STM32F439i-EVAL board files
FIX: Fixed crash when passing NULL to gwinSetStyle() FIX: Fixed crash when passing NULL to gwinSetStyle()
FIX: Fixed potential crash when GDISP_NEED_TEXT_WORDWRAP is turned on
*** Release 2.6 *** *** Release 2.6 ***

5
src/gdisp/gdisp.c
View File

@ -3170,7 +3170,10 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/* Callback to render string boxes with word wrap. */ /* Callback to render string boxes with word wrap. */
#if GDISP_NEED_TEXT_WORDWRAP #if GDISP_NEED_TEXT_WORDWRAP
static bool mf_countline_callback(mf_str line, uint16_t count, void *state) { static bool mf_countline_callback(mf_str line, uint16_t count, void *state) {
int *linecount = (int*)state; (void) line;
(void) count;
uint16_t *linecount = (uint16_t*)state;
(*linecount)++; (*linecount)++;
return TRUE; return TRUE;