]> git.imager.perl.org - imager.git/commitdiff
add missing va_end() in bmp.c's write_packed()
authorTony Cook <tony@develop-help.com>
Sat, 2 Feb 2019 00:29:19 +0000 (11:29 +1100)
committerTony Cook <tony@develop-help.com>
Sat, 2 Feb 2019 00:29:19 +0000 (11:29 +1100)
In general it wasn't calling va_end() on a write failure.

CID 185320.

bmp.c

diff --git a/bmp.c b/bmp.c
index 61a7d82dfab6c67fad3c6f0eb90c8ab14a1c9878..caf59b422ca766f9a8a27e2dbd93efb56c91d653 100644 (file)
--- a/bmp.c
+++ b/bmp.c
@@ -311,7 +311,7 @@ write_packed(io_glue *ig, char *format, ...) {
       buf[0] = i & 255;
       buf[1] = i / 256;
       if (i_io_write(ig, buf, 2) == -1)
-       return 0;
+       goto fail;
       break;
 
     case 'V':
@@ -320,14 +320,14 @@ write_packed(io_glue *ig, char *format, ...) {
       buf[2] = (i >> 16) & 0xFF;
       buf[3] = (i >> 24) & 0xFF;
       if (i_io_write(ig, buf, 4) == -1)
-       return 0;
+       goto fail;
       break;
 
     case 'C':
     case 'c':
       buf[0] = i & 0xFF;
       if (i_io_write(ig, buf, 1) == -1)
-       return 0;
+       goto fail;
       break;
 
     default:
@@ -341,6 +341,10 @@ write_packed(io_glue *ig, char *format, ...) {
   va_end(ap);
 
   return 1;
+
+ fail:
+  va_end(ap);
+  return 0;
 }
 
 /*