procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix image-cache-size crash

Browse source 
* src/image.c (image_frame_cache_size): Ensure that img->pixmap is
in use before trying to access it.
This commit is contained in:
Lars Ingebrigtsen 2020-12-11 21:16:04 +01:00
parent 6864dc1dff
commit 711e7bf29c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/image.c
View file

@ -1795,8 +1795,9 @@ which is then usually a filename. */)
static int
image_frame_cache_size (struct frame *f)
{
struct image_cache *c = FRAME_IMAGE_CACHE (f);
int total = 0;
#ifdef USE_CAIRO
struct image_cache *c = FRAME_IMAGE_CACHE (f);
if (!c)
return 0;
@ -1805,12 +1806,11 @@ image_frame_cache_size (struct frame *f)
{
struct image *img = c->images[i];
#ifdef USE_CAIRO
if (img)
if (img && img->pixmap && img->pixmap != NO_PIXMAP)
total += img->pixmap->width * img->pixmap->height *
img->pixmap->bits_per_pixel / 8;
#endif
}
#endif
return total;
}