- Reverted the datauri patch.

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b19d8c4..dd4b876f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,7 +88,6 @@ dillo-fltk2
  - Fixed a bug in a_Url_cmp.
  - Fixed a bug in Cookies_parse_one. Set it to a single return point too!
  - Added dStr_memmem() and dStr_printable() to dlib.
- - Fixed a decoding bug in the datauri dpi.
    Patches: place
 +- Fixed a problem with locally-installed dpis.
  - Added code for optional image loading (nice interface) very advanced!
diff --git a/dpi/datauri.c b/dpi/datauri.c
index 7677fd96..d556f610 100644
--- a/dpi/datauri.c
+++ b/dpi/datauri.c
@@ -252,9 +252,11 @@ static unsigned char *datauri_get_data(char *url, size_t *p_sz)
 
    if (p) {
       ++p;
-      data = (unsigned char *)a_Url_decode_hex_str(p, p_sz);
       if (is_base64) {
+         data = (unsigned char *)dStrdup(p);
          *p_sz = (size_t) b64decode(data);
+      } else {
+         data = (unsigned char *)a_Url_decode_hex_str(p, p_sz);
       }
    } else {
       data = (unsigned char *)dStrdup("");