diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-12-28 13:19:47 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2017-01-09 13:21:40 +0100 |
commit | bbcc85a9f746c161b2e23c6057e69ec7b967252b (patch) | |
tree | 8ead60bd762cc0cbf945c002c769e74699594c0b /source/html/html-layout.c | |
parent | e9667e7f8ab7c154d8932916a22c33cf2bad0445 (diff) | |
download | mupdf-bbcc85a9f746c161b2e23c6057e69ec7b967252b.tar.xz |
Add fz_terminate_buffer function.
Non-destructively zero terminate a fz_buffer for use as a C string.
Diffstat (limited to 'source/html/html-layout.c')
-rw-r--r-- | source/html/html-layout.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 91297f10..ff2102d1 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -406,10 +406,7 @@ static fz_image *load_html_image(fz_context *ctx, fz_archive *zip, const char *b buf = fz_read_archive_entry(ctx, zip, path); #if FZ_ENABLE_SVG if (strstr(path, ".svg")) - { - fz_write_buffer_byte(ctx, buf, 0); img = fz_new_image_from_svg(ctx, buf); - } else #endif img = fz_new_image_from_buffer(ctx, buf); @@ -2552,7 +2549,7 @@ fz_parse_html(fz_context *ctx, fz_html_font_set *set, fz_archive *zip, const cha fz_xml *xml; fz_html *html; unsigned char *data; - size_t len = fz_buffer_storage(ctx, buf, &data); + size_t len; fz_css_match match; struct genstate g; @@ -2565,6 +2562,8 @@ fz_parse_html(fz_context *ctx, fz_html_font_set *set, fz_archive *zip, const cha g.emit_white = 0; g.last_brk_cls = UCDN_LINEBREAK_CLASS_OP; + fz_terminate_buffer(ctx, buf); + len = fz_buffer_storage(ctx, buf, &data); xml = fz_parse_xml(ctx, data, len, 1); g.css = fz_new_css(ctx); |