auto upstream

5 files changed, 21 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index adff00f7189..08fd647074f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix misuse of ImageMagick that caused core dump (Bug#13846).
+        * image.c (imagemagick_load_image): Calculate height and width
+        after flattening the image, not before.
+
+2013-03-04  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
+        * ftfont.c (ftfont_shape_by_flt): Likewise.
+        * w32uniscribe.c (uniscribe_shape): Likewise.
+
 2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
@@ -208,6 +220,7 @@
         of dumping Emacs.  Explain why.
 
 2013-02-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * search.c (find_newline): Return byte position in bytepos.
         Adjust comment.
         (find_next_newline_no_quit, find_before_next_newline):
diff --git a/src/font.c b/src/font.c
index e2ea7262397..c6707cf31a8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4716,7 +4716,7 @@ the corresponding element is nil.  */)
       code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)
         continue;
-      g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+      g = LGLYPH_NEW ();
       LGLYPH_SET_FROM (g, i);
       LGLYPH_SET_TO (g, i);
       LGLYPH_SET_CHAR (g, c);
diff --git a/src/ftfont.c b/src/ftfont.c
index 1fb1b574a1c..867e25a7a25 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2541,7 +2541,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
 
       if (NILP (lglyph))
         {
-          lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+          lglyph = LGLYPH_NEW ();
           LGSTRING_SET_GLYPH (lgstring, i, lglyph);
         }
       LGLYPH_SET_FROM (lglyph, g->from);
diff --git a/src/image.c b/src/image.c
index 726b65d7338..2d4e7e731ad 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7792,11 +7792,6 @@ imagemagick_load_image (struct frame *f, struct image *img,
         }
     }
 
-  /* Finally we are done manipulating the image.  Figure out the
-     resulting width/height and transfer ownership to Emacs.  */
-  height = MagickGetImageHeight (image_wand);
-  width = MagickGetImageWidth (image_wand);
-
   /* Set the canvas background color to the frame or specified
      background, and flatten the image.  Note: as of ImageMagick
      6.6.0, SVG image transparency is not handled properly
@@ -7813,6 +7808,11 @@ imagemagick_load_image (struct frame *f, struct image *img,
     image_wand = new_wand;
   }
 
+  /* Finally we are done manipulating the image.  Figure out the
+     resulting width/height and transfer ownership to Emacs.  */
+  height = MagickGetImageHeight (image_wand);
+  width = MagickGetImageWidth (image_wand);
+
   if (! (width <= INT_MAX && height <= INT_MAX
          && check_image_size (f, width, height)))
     {
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 56931adfac5..c153c8f3565 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -333,7 +333,7 @@ uniscribe_shape (Lisp_Object lgstring)
 
                   if (NILP (lglyph))
                     {
-                      lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+                      lglyph = LGLYPH_NEW ();
                       LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph);
                     }
                   /* Copy to a 32-bit data type to shut up the