i_img_info() (C API) no longer tries to handle a NULL image object pointer.

diff --git a/Changes b/Changes
index b6c0f94805926bf6a0210894aac7138f442c4a5e..c06e676c24783a2408a5c3dbd242a6ba4b8a0714 100644 (file)
--- a/Changes
+++ b/Changes
@@ -109,6 +109,9 @@ High severity:
    glyph index with a NULL character map.  This should be rare.  CID
    185297.
 
    glyph index with a NULL character map.  This should be rare.  CID
    185297.
 

+ - i_img_info() (C API) no longer tries to handle a NULL image object
+   pointer.  CID 185298.
+

 [1] The first two build submissions ended up at the end of a ~400
 build queue, and seemed to have been cancelled by Coverity.  A build
 submitted on NYE went through in minutes.
 [1] The first two build submissions ended up at the end of a ~400
 build queue, and seemed to have been cancelled by Coverity.  A build
 submitted on NYE went through in minutes.

diff --git a/image.c b/image.c
index cdfa2ed4aaa1a5575b239be374c7d667d4d84dee..bd634ee1480b43ff15664653043a052a456c9661 100644 (file)
--- a/image.c
+++ b/image.c
@@ -318,21 +318,15 @@ void
 i_img_info(i_img *im, i_img_dim *info) {
   dIMCTXim(im);
   im_log((aIMCTX,1,"i_img_info(im %p)\n",im));
 i_img_info(i_img *im, i_img_dim *info) {
   dIMCTXim(im);
   im_log((aIMCTX,1,"i_img_info(im %p)\n",im));

-  if (im != NULL) {
-    im_log((aIMCTX,1,"i_img_info: xsize=%" i_DF " ysize=%" i_DF " channels=%d "
-           "mask=%ud\n",
-           i_DFc(im->xsize), i_DFc(im->ysize), im->channels,im->ch_mask));
-    im_log((aIMCTX,1,"i_img_info: idata=%p\n",im->idata));
-    info[0] = im->xsize;
-    info[1] = im->ysize;
-    info[2] = im->channels;
-    info[3] = im->ch_mask;
-  } else {
-    info[0] = 0;
-    info[1] = 0;
-    info[2] = 0;
-    info[3] = 0;
-  }
+
+  im_log((aIMCTX,1,"i_img_info: xsize=%" i_DF " ysize=%" i_DF " channels=%d "
+         "mask=%ud\n",
+         i_DFc(im->xsize), i_DFc(im->ysize), im->channels,im->ch_mask));
+  im_log((aIMCTX,1,"i_img_info: idata=%p\n",im->idata));
+  info[0] = im->xsize;
+  info[1] = im->ysize;
+  info[2] = im->channels;
+  info[3] = im->ch_mask;

 }
 
 /*
 }
 
 /*