pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

particle/string: mbstowcs() may fail. When it does, don't crash

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-29 23:32:27 +01:00
parent 732470e5a6
commit 2d343755ce
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
particles/string.c
View file

@ -45,19 +45,23 @@ begin_expose(struct exposable *exposable)
font->name, font->fextents.ascent,
font->fextents.descent, font->fextents.height);
size_t chars = mbstowcs(NULL, e->text, 0);
wchar_t wtext[chars + 1];
mbstowcs(wtext, e->text, chars + 1);
e->glyphs = malloc(chars * sizeof(e->glyphs[0]));
e->glyphs = NULL;
e->num_glyphs = 0;
/* Convert text to glyph masks/images. */
for (size_t i = 0; i < chars; i++) {
const struct glyph *glyph = font_glyph_for_wc(font, wtext[i]);
if (glyph == NULL)
continue;
e->glyphs[e->num_glyphs++] = glyph;
size_t chars = mbstowcs(NULL, e->text, 0);
if (chars != (size_t)-1) {
wchar_t wtext[chars + 1];
mbstowcs(wtext, e->text, chars + 1);
e->glyphs = malloc(chars * sizeof(e->glyphs[0]));
/* Convert text to glyph masks/images. */
for (size_t i = 0; i < chars; i++) {
const struct glyph *glyph = font_glyph_for_wc(font, wtext[i]);
if (glyph == NULL)
continue;
e->glyphs[e->num_glyphs++] = glyph;
}
}
exposable->width = exposable->particle->left_margin +