mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Immediate-Mode-UI:master' into v5-Skin

This commit is contained in:
FrostKiwi 2023-04-19 14:00:51 +09:00 committed by GitHub
parent d64af86f66 1d9fb0bc79
commit a6540b3e14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demo/allegro5/nuklear_allegro5.h
View File

@ -101,7 +101,7 @@ static float
nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text, int len) nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text, int len)
{ {
float width; float width;
char *strcpy; char *str;
NkAllegro5Font *font = (NkAllegro5Font*)handle.ptr; NkAllegro5Font *font = (NkAllegro5Font*)handle.ptr;
NK_UNUSED(height); NK_UNUSED(height);
if (!font || !text) { if (!font || !text) {
@ -111,11 +111,11 @@ nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text
as nuklear uses variable size buffers and al_get_text_width doesn't as nuklear uses variable size buffers and al_get_text_width doesn't
accept a length, it infers length from null-termination accept a length, it infers length from null-termination
(which is unsafe API design by allegro devs!) */ (which is unsafe API design by allegro devs!) */
strcpy = malloc(len + 1); str = calloc((size_t)len + 1, 1);
strncpy(strcpy, text, len); if(!str) return 0;
strcpy[len] = '\0'; strncpy(str, text, len);
width = al_get_text_width(font->font, strcpy); width = al_get_text_width(font->font, str);
free(strcpy); free(str);
return width; return width;
} }
@ -473,10 +473,9 @@ nk_allegro5_clipboard_copy(nk_handle usr, const char *text, int len)
char *str = 0; char *str = 0;
(void)usr; (void)usr;
if (!len) return; if (!len) return;
str = (char*)malloc((size_t)len+1); str = calloc((size_t)len + 1, 1);
if (!str) return; if (!str) return;
memcpy(str, text, (size_t)len); strncpy(str, text, len);
str[len] = '\0';
al_set_clipboard_text(allegro5.dsp, str); al_set_clipboard_text(allegro5.dsp, str);
free(str); free(str);
} }