switch (code) {
case 'v':
if (i_io_read(ig, buf, 2) != 2)
- return 0;
+ goto fail;
work = buf[0] + ((i_packed_t)buf[1] << 8);
if (shrieking)
*p = (work ^ SIGNBIT16) - SIGNBIT16;
case 'V':
if (i_io_read(ig, buf, 4) != 4)
- return 0;
+ goto fail;
work = buf[0] + (buf[1] << 8) + ((i_packed_t)buf[2] << 16) + ((i_packed_t)buf[3] << 24);
if (shrieking)
*p = (work ^ SIGNBIT32) - SIGNBIT32;
case 'C':
if (i_io_read(ig, buf, 1) != 1)
- return 0;
+ goto fail;
*p = buf[0];
break;
case 'c':
if (i_io_read(ig, buf, 1) != 1)
- return 0;
+ goto fail;
*p = (char)buf[0];
break;
case '3': /* extension - 24-bit number */
if (i_io_read(ig, buf, 3) != 3)
- return 0;
+ goto fail;
*p = buf[0] + (buf[1] << 8) + ((i_packed_t)buf[2] << 16);
break;
}
}
}
+ va_end(ap);
return 1;
+
+ fail:
+ va_end(ap);
+ return 0;
}
/*
buf[0] = i & 255;
buf[1] = i / 256;
if (i_io_write(ig, buf, 2) == -1)
- return 0;
+ goto fail;
break;
case 'V':
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:
va_end(ap);
return 1;
+
+ fail:
+ va_end(ap);
+ return 0;
}
/*
return NULL;
}
- if (xsize + 8 < xsize) { /* if there was overflow */
+ if ((i_img_dim)((i_img_dim_u)xsize + 8) < xsize) { /* if there was overflow */
/* we check with 8 because we allocate that much for the decoded
line buffer */
i_push_error(0, "integer overflow during memory allocation");