summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2011-04-04 17:56:15 +0000
committercorvid <corvid@lavabit.com>2011-04-04 17:56:15 +0000
commit9572807453da1e92657df7b88eb8a5e0f578d21c (patch)
tree626f378dd4594fcd6b2d7b4dac4274051417a6e5
parentda2887c4a786ffdb97ce89fa257ef9818b53285c (diff)
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.
-rw-r--r--dw/fltkimgbuf.cc2
-rw-r--r--src/gif.c2
-rw-r--r--src/html.cc2
-rw-r--r--src/jpeg.c2
-rw-r--r--src/png.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/dw/fltkimgbuf.cc b/dw/fltkimgbuf.cc
index 6ba7ff1d..e3be41a9 100644
--- a/dw/fltkimgbuf.cc
+++ b/dw/fltkimgbuf.cc
@@ -193,7 +193,7 @@ core::Imgbuf* FltkImgbuf::getScaledBuf (int width, int height)
*/
if (width <= 0 || height <= 0 ||
width > IMAGE_MAX_AREA / height) {
- MSG("FltkImgbuf::getScaledBuf: suspicious image size request %dx%d\n",
+ MSG("FltkImgbuf::getScaledBuf: suspicious image size request %d x %d\n",
width, height);
ref ();
return this;
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 */