mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 19:07:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when using pango markup font

Browse source 
The characters & < > ' " needs to be escaped when using pango markup

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
This commit is contained in:
Heghedus Razvan 2018-05-07 19:30:45 +03:00 • committed by Heghedus Razvan
parent 61aa0937a7
commit 789a877b37
3 changed files with 99 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

73
common/pango.c
View file

@ -8,6 +8,68 @@
#include <string.h>
#include "log.h"
int escape_markup_text(const char *src, char *dest, int dest_length) {
int length = 0;
while (src[0]) {
switch (src[0]) {
case '&':
length += 5;
if (dest && dest_length - length >= 0) {
dest += sprintf(dest, "%s", "&amp;");
} else {
dest_length = -1;
}
break;
case '<':
length += 4;
if (dest && dest_length - length >= 0) {
dest += sprintf(dest, "%s", "&lt;");
} else {
dest_length = -1;
}
break;
case '>':
length += 4;
if (dest && dest_length - length >= 0) {
dest += sprintf(dest, "%s", "&gt;");
} else {
dest_length = -1;
}
break;
case '\'':
length += 6;
if (dest && dest_length - length >= 0) {
dest += sprintf(dest, "%s", "&apos;");
} else {
dest_length = -1;
}
break;
case '"':
length += 6;
if (dest && dest_length - length >= 0) {
dest += sprintf(dest, "%s", "&quot;");
} else {
dest_length = -1;
}
break;
default:
length += 1;
if (dest && dest_length - length >= 0) {
*(dest++) = *src;
} else {
dest_length = -1;
}
}
src++;
}
// if we could not fit the escaped string in dest, return -1
if (dest && dest_length == -1) {
return -1;
}
return length;
}
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
const char *text, int32_t scale, bool markup) {
PangoLayout *layout = pango_cairo_create_layout(cairo);
@ -15,13 +77,14 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
if (markup) {
char *buf;
GError *error = NULL;
if (!sway_assert(pango_parse_markup(
text, -1, 0, &attrs, &buf, NULL, &error),
"pango_parse_markup '%s' -> error %s", text,
error ? error->message : NULL)) {
bool result = pango_parse_markup(text, -1, 0, &attrs, &buf,
NULL, &error);
if (result) {
wlr_log(L_ERROR, "pango_parse_markup '%s' -> error %s", text,
error->message);
return NULL;
}
pango_layout_set_markup(layout, buf, -1);
pango_layout_set_markup(layout, text, -1);
free(buf);
} else {
attrs = pango_attr_list_new();