Partially disabled previous change.

* src/image.c (svg_load): Temporarily disabled filename thing for
not-a-file case as it can cause crashs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e10ffd8fcd75f2ce0cb6e48280bc7e23ff51431..455ec1e8387743cb64fcf34bcd21f8fa610df5ca 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-17  Ulf Jasper  <ulf.jasper@web.de>
+
+       Partially disabled previous change.
+
+       * image.c (svg_load): Temporarily disabled filename thing for
+       not-a-file case as it can cause crashs.
+
 2014-12-17  Ulf Jasper  <ulf.jasper@web.de>
 
        Fix problem with images referenced within svg files. (bug#19373)

diff --git a/src/image.c b/src/image.c
index 0bebd45d8936b0bf05f9ff16df8c9ad84f4b51e8..954d66424d1b061c945c6ff7cbd663c5e117f7c2 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8823,8 +8823,10 @@ svg_load (struct frame *f, struct image *img)
          return 0;
        }
       original_filename = BVAR (current_buffer, filename);
+      /* FIXME: disabled the filename thing for the time being as it
+         can cause crashs. */
       success_p = svg_load_image (f, img, SDATA (data), SBYTES (data),
-                                  SDATA(original_filename));
+                                  NULL /* SDATA(original_filename) */);
     }
 
   return success_p;