Commit 20ce5912 authored by Paul Eggert's avatar Paul Eggert
Browse files

* image.c (gif_load): Rename local to avoid shadowing.

parent a3dd1c67
2011-06-08 Paul Eggert <eggert@cs.ucla.edu> 2011-06-08 Paul Eggert <eggert@cs.ucla.edu>
* image.c (gif_load): Rename local to avoid shadowing.
* lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow. * lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow.
(struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member. (struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member.
* alloc.c (make_save_value): Integer argument is now of type * alloc.c (make_save_value): Integer argument is now of type
......
...@@ -7146,12 +7146,12 @@ gif_load (struct frame *f, struct image *img) ...@@ -7146,12 +7146,12 @@ gif_load (struct frame *f, struct image *img)
/* Which sub-image are we to display? */ /* Which sub-image are we to display? */
{ {
Lisp_Object index = image_spec_value (img->spec, QCindex, NULL); Lisp_Object image_number = image_spec_value (img->spec, QCindex, NULL);
idx = INTEGERP (index) ? XFASTINT (index) : 0; idx = INTEGERP (image_number) ? XFASTINT (image_number) : 0;
if (idx < 0 || idx >= gif->ImageCount) if (idx < 0 || idx >= gif->ImageCount)
{ {
image_error ("Invalid image number `%s' in image `%s'", image_error ("Invalid image number `%s' in image `%s'",
index, img->spec); image_number, img->spec);
fn_DGifCloseFile (gif); fn_DGifCloseFile (gif);
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment