diff options
| author | ae <ae@FreeBSD.org> | 2014-06-06 12:37:56 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2014-06-06 12:37:56 +0000 |
| commit | 2c6af1420a13bc7ad858b0c83fc17b06fb9d6bea (patch) | |
| tree | 797e4ad0de1b79b3b7f91a6d5e8f1e158ea28359 /sys/geom/part/g_part_gpt.c | |
| parent | f6c16fe464109fd3626ef09e82e19190731d7e0c (diff) | |
| download | FreeBSD-src-2c6af1420a13bc7ad858b0c83fc17b06fb9d6bea.zip FreeBSD-src-2c6af1420a13bc7ad858b0c83fc17b06fb9d6bea.tar.gz | |
MFC r266880:
Use g_conf_printf_escaped() to escape symbols, which can break
an XML tree.
Diffstat (limited to 'sys/geom/part/g_part_gpt.c')
| -rw-r--r-- | sys/geom/part/g_part_gpt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index b547f0b..4af2868 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/uuid.h> #include <geom/geom.h> +#include <geom/geom_int.h> #include <geom/part/g_part.h> #include "g_part_if.h" @@ -1230,16 +1231,16 @@ g_gpt_printf_utf16(struct sbuf *sb, uint16_t *str, size_t len) /* Write the Unicode character in UTF-8 */ if (ch < 0x80) - sbuf_printf(sb, "%c", ch); + g_conf_printf_escaped(sb, "%c", ch); else if (ch < 0x800) - sbuf_printf(sb, "%c%c", 0xc0 | (ch >> 6), + g_conf_printf_escaped(sb, "%c%c", 0xc0 | (ch >> 6), 0x80 | (ch & 0x3f)); else if (ch < 0x10000) - sbuf_printf(sb, "%c%c%c", 0xe0 | (ch >> 12), + g_conf_printf_escaped(sb, "%c%c%c", 0xe0 | (ch >> 12), 0x80 | ((ch >> 6) & 0x3f), 0x80 | (ch & 0x3f)); else if (ch < 0x200000) - sbuf_printf(sb, "%c%c%c%c", 0xf0 | (ch >> 18), - 0x80 | ((ch >> 12) & 0x3f), + g_conf_printf_escaped(sb, "%c%c%c%c", 0xf0 | + (ch >> 18), 0x80 | ((ch >> 12) & 0x3f), 0x80 | ((ch >> 6) & 0x3f), 0x80 | (ch & 0x3f)); } } |
