diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-05-05 18:18:36 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-05-05 20:02:20 +0200 |
| commit | 8219259c39f19f45c2f094a6ba7930f940b1074a (patch) | |
| tree | d6b654c99a91f119c66bd805d5ab28c0807d922f /source/html | |
| parent | 3d81ce6e34e6216b4ec67deee50aab60097a52b0 (diff) | |
| download | mupdf-8219259c39f19f45c2f094a6ba7930f940b1074a.tar.xz | |
epub: Decode URL escapes in epub paths.
Diffstat (limited to 'source/html')
| -rw-r--r-- | source/html/epub-doc.c | 2 | ||||
| -rw-r--r-- | source/html/html-layout.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c index 2ea9f298..e77770ac 100644 --- a/source/html/epub-doc.c +++ b/source/html/epub-doc.c @@ -164,7 +164,7 @@ path_from_idref(char *path, fz_xml *manifest, const char *base_uri, const char * fz_strlcpy(path, base_uri, n); fz_strlcat(path, "/", n); fz_strlcat(path, rel_path, n); - return fz_cleanname(path); + return fz_cleanname(fz_urldecode(path)); } static epub_chapter * diff --git a/source/html/html-layout.c b/source/html/html-layout.c index a64fccc4..4926dc51 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -129,6 +129,7 @@ static void generate_image(fz_context *ctx, fz_archive *zip, const char *base_ur fz_strlcpy(path, base_uri, sizeof path); fz_strlcat(path, "/", sizeof path); fz_strlcat(path, src, sizeof path); + fz_urldecode(path); fz_cleanname(path); fz_try(ctx) @@ -1024,6 +1025,7 @@ html_load_css(fz_context *ctx, fz_archive *zip, const char *base_uri, fz_css_rul fz_strlcpy(path, base_uri, sizeof path); fz_strlcat(path, "/", sizeof path); fz_strlcat(path, href, sizeof path); + fz_urldecode(path); fz_cleanname(path); buf = fz_read_archive_entry(ctx, zip, path); |