summaryrefslogtreecommitdiff
path: root/nuklear_ui
diff options
context:
space:
mode:
authorMichael Pavone <pavone@retrodev.com>2018-06-28 09:27:05 -0700
committerMichael Pavone <pavone@retrodev.com>2018-06-28 09:27:05 -0700
commit5f1a3e5c10bd84d5049b1a8a56c5aace468761cb (patch)
tree324045c83ac9f6d1475be867ee7b0dba642290c9 /nuklear_ui
parente1d177b8429e4eb59f5a6e853009dbf97ab95068 (diff)
Fix a number of other memory errors (mostly leaks again) identified by valgrind
Diffstat (limited to 'nuklear_ui')
-rw-r--r--nuklear_ui/blastem_nuklear.c2
-rw-r--r--nuklear_ui/font.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c
index 3621718..d347e54 100644
--- a/nuklear_ui/blastem_nuklear.c
+++ b/nuklear_ui/blastem_nuklear.c
@@ -616,6 +616,7 @@ void settings_int_input(struct nk_context *context, char *label, char *path, cha
len = 11;
}
memcpy(buffer, curstr, len);
+ memset(buffer+len, 0, sizeof(buffer)-len);
nk_edit_string(context, NK_EDIT_SIMPLE, buffer, &len, sizeof(buffer)-1, nk_filter_decimal);
buffer[len] = 0;
if (strcmp(buffer, curstr)) {
@@ -1068,6 +1069,7 @@ static void texture_init(void)
fatal_error("Failed to find default font path\n");
}
def_font = nk_font_atlas_add_from_memory(atlas, font, font_size, render_height() / 16, NULL);
+ free(font);
nk_sdl_font_stash_end();
nk_style_set_font(context, &def_font->handle);
if (controller_360_buf) {
diff --git a/nuklear_ui/font.c b/nuklear_ui/font.c
index 006ae48..ff86847 100644
--- a/nuklear_ui/font.c
+++ b/nuklear_ui/font.c
@@ -35,6 +35,7 @@ uint8_t *default_font(uint32_t *size_out)
goto error;
}
FILE *f = fopen(path, "rb");
+ free(path);
if (!f) {
goto error;
}