From aa9d7d8ca19f4489839f765ad7f190e8141bd001 Mon Sep 17 00:00:00 2001 From: Connor E <38229097+c-edw@users.noreply.github.com> Date: Wed, 16 Jan 2019 01:57:53 +0000 Subject: Remove usage of VLAs. --- common/pango.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'common/pango.c') diff --git a/common/pango.c b/common/pango.c index 3bc97808..18b92e9d 100644 --- a/common/pango.c +++ b/common/pango.c @@ -87,11 +87,11 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, int *baseline, double scale, bool markup, const char *fmt, ...) { - char buf[max_chars]; + char *buf = malloc(sizeof(char) * max_chars); va_list args; va_start(args, fmt); - if (vsnprintf(buf, sizeof(buf), fmt, args) >= max_chars) { + if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) { strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); } va_end(args); @@ -103,15 +103,17 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE; } g_object_unref(layout); + + free(buf); } void pango_printf(cairo_t *cairo, const char *font, double scale, bool markup, const char *fmt, ...) { - char buf[max_chars]; + char *buf = malloc(sizeof(char) * max_chars); va_list args; va_start(args, fmt); - if (vsnprintf(buf, sizeof(buf), fmt, args) >= max_chars) { + if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) { strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); } va_end(args); @@ -124,4 +126,6 @@ void pango_printf(cairo_t *cairo, const char *font, pango_cairo_update_layout(cairo, layout); pango_cairo_show_layout(cairo, layout); g_object_unref(layout); + + free(buf); } -- cgit v1.2.3-54-g00ecf