From 9572807453da1e92657df7b88eb8a5e0f578d21c Mon Sep 17 00:00:00 2001 From: corvid Date: Mon, 4 Apr 2011 17:56:15 +0000 Subject: clearer MSG for suspicious image size I saw a MSG with size 0x[something], and of course I thought it was complaining that a size was given in hex notation. --- src/gif.c | 2 +- src/html.cc | 2 +- src/jpeg.c | 2 +- src/png.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gif.c b/src/gif.c index 50c68960..b5486c46 100644 --- a/src/gif.c +++ b/src/gif.c @@ -804,7 +804,7 @@ static size_t Gif_do_img_desc(DilloGif *gif, void *Buf, /* check max image size */ if (gif->Width <= 0 || gif->Height <= 0 || gif->Width > IMAGE_MAX_AREA / gif->Height) { - MSG("Gif_do_img_desc: suspicious image size request %ux%u\n", + MSG("Gif_do_img_desc: suspicious image size request %u x %u\n", gif->Width, gif->Height); gif->state = 999; return 0; diff --git a/src/html.cc b/src/html.cc index c5acfa4a..8291aad9 100644 --- a/src/html.cc +++ b/src/html.cc @@ -2044,7 +2044,7 @@ DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, dFree(width_ptr); dFree(height_ptr); width_ptr = height_ptr = NULL; - MSG("a_Html_image_new: suspicious image size request %dx%d\n", w, h); + MSG("a_Html_image_new: suspicious image size request %d x %d\n", w, h); } else { if (CSS_LENGTH_TYPE(l_w) != CSS_LENGTH_TYPE_AUTO) html->styleEngine->setNonCssHint (CSS_PROPERTY_WIDTH, diff --git a/src/jpeg.c b/src/jpeg.c index a6af3a2b..93d9df07 100644 --- a/src/jpeg.c +++ b/src/jpeg.c @@ -291,7 +291,7 @@ static void Jpeg_write(DilloJpeg *jpeg, void *Buf, uint_t BufSize) if (jpeg->cinfo.image_width <= 0 || jpeg->cinfo.image_height <= 0 || jpeg->cinfo.image_width > IMAGE_MAX_AREA / jpeg->cinfo.image_height) { - MSG("Jpeg_write: suspicious image size request %ux%u\n", + MSG("Jpeg_write: suspicious image size request %u x %u\n", (uint_t)jpeg->cinfo.image_width, (uint_t)jpeg->cinfo.image_height); jpeg->state = DILLO_JPEG_ERROR; diff --git a/src/png.c b/src/png.c index b82046b9..bf9de2ef 100644 --- a/src/png.c +++ b/src/png.c @@ -137,7 +137,7 @@ Png_datainfo_callback(png_structp png_ptr, png_infop info_ptr) /* check max image size */ if (png->width == 0 || png->height == 0 || png->width > IMAGE_MAX_AREA / png->height) { - MSG("Png_datainfo_callback: suspicious image size request %lux%lu\n", + MSG("Png_datainfo_callback: suspicious image size request %lu x %lu\n", (ulong_t) png->width, (ulong_t) png->height); Png_error_handling(png_ptr, "Aborting..."); return; /* not reached */ -- cgit v1.2.3