From 20ce591249aca6b81d5d528e47d6232e8a831201 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 Jun 2011 14:44:48 -0700 Subject: [PATCH] * image.c (gif_load): Rename local to avoid shadowing. --- src/ChangeLog | 2 ++ src/image.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f54d40db39..d25f9910a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-08 Paul Eggert + * image.c (gif_load): Rename local to avoid shadowing. + * lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow. (struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member. * alloc.c (make_save_value): Integer argument is now of type diff --git a/src/image.c b/src/image.c index cdf05c7876..31b3f01c17 100644 --- a/src/image.c +++ b/src/image.c @@ -7146,12 +7146,12 @@ gif_load (struct frame *f, struct image *img) /* Which sub-image are we to display? */ { - Lisp_Object index = image_spec_value (img->spec, QCindex, NULL); - idx = INTEGERP (index) ? XFASTINT (index) : 0; + Lisp_Object image_number = image_spec_value (img->spec, QCindex, NULL); + idx = INTEGERP (image_number) ? XFASTINT (image_number) : 0; if (idx < 0 || idx >= gif->ImageCount) { image_error ("Invalid image number `%s' in image `%s'", - index, img->spec); + image_number, img->spec); fn_DGifCloseFile (gif); return 0; } -- 2.20.1