diff options
| author | Paul Eggert | 2013-03-04 09:35:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-03-04 09:35:29 -0800 |
| commit | 84ac6f9d211796a458214741bdf9677b92bf1c2a (patch) | |
| tree | 1343e8af8390f4188cb7d5612fc38f743f6231a2 /src/ChangeLog | |
| parent | 8bd104b35b2a51e007e2f1d35cdb4ed00c15ae4a (diff) | |
| download | emacs-84ac6f9d211796a458214741bdf9677b92bf1c2a.tar.gz emacs-84ac6f9d211796a458214741bdf9677b92bf1c2a.zip | |
Fix misuse of ImageMagick that caused core dump.
* image.c (imagemagick_load_image): Calculate height and width
after flattening the image, not before.
Fixes: debbugs:13846
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d6ddb9b06a..08fd647074f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-03-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix misuse of ImageMagick that caused core dump (Bug#13846). | ||
| 4 | * image.c (imagemagick_load_image): Calculate height and width | ||
| 5 | after flattening the image, not before. | ||
| 6 | |||
| 1 | 2013-03-04 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2013-03-04 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. | 9 | * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. |