diff options
Diffstat (limited to 'common/pango.c')
-rw-r--r-- | common/pango.c | 12 |
1 files changed, 8 insertions, 4 deletions
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, | |||
87 | 87 | ||
88 | void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, | 88 | void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, |
89 | int *baseline, double scale, bool markup, const char *fmt, ...) { | 89 | int *baseline, double scale, bool markup, const char *fmt, ...) { |
90 | char buf[max_chars]; | 90 | char *buf = malloc(sizeof(char) * max_chars); |
91 | 91 | ||
92 | va_list args; | 92 | va_list args; |
93 | va_start(args, fmt); | 93 | va_start(args, fmt); |
94 | if (vsnprintf(buf, sizeof(buf), fmt, args) >= max_chars) { | 94 | if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) { |
95 | strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); | 95 | strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); |
96 | } | 96 | } |
97 | va_end(args); | 97 | va_end(args); |
@@ -103,15 +103,17 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, | |||
103 | *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE; | 103 | *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE; |
104 | } | 104 | } |
105 | g_object_unref(layout); | 105 | g_object_unref(layout); |
106 | |||
107 | free(buf); | ||
106 | } | 108 | } |
107 | 109 | ||
108 | void pango_printf(cairo_t *cairo, const char *font, | 110 | void pango_printf(cairo_t *cairo, const char *font, |
109 | double scale, bool markup, const char *fmt, ...) { | 111 | double scale, bool markup, const char *fmt, ...) { |
110 | char buf[max_chars]; | 112 | char *buf = malloc(sizeof(char) * max_chars); |
111 | 113 | ||
112 | va_list args; | 114 | va_list args; |
113 | va_start(args, fmt); | 115 | va_start(args, fmt); |
114 | if (vsnprintf(buf, sizeof(buf), fmt, args) >= max_chars) { | 116 | if (vsnprintf(buf, sizeof(char) * max_chars, fmt, args) >= max_chars) { |
115 | strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); | 117 | strcpy(&buf[sizeof(buf) - sizeof(overflow)], overflow); |
116 | } | 118 | } |
117 | va_end(args); | 119 | va_end(args); |
@@ -124,4 +126,6 @@ void pango_printf(cairo_t *cairo, const char *font, | |||
124 | pango_cairo_update_layout(cairo, layout); | 126 | pango_cairo_update_layout(cairo, layout); |
125 | pango_cairo_show_layout(cairo, layout); | 127 | pango_cairo_show_layout(cairo, layout); |
126 | g_object_unref(layout); | 128 | g_object_unref(layout); |
129 | |||
130 | free(buf); | ||
127 | } | 131 | } |