From 3ee9bb6efff8929ff8df4fb7ca42001c2aeacdf6 Mon Sep 17 00:00:00 2001 From: Julian Smith Date: Thu, 21 Nov 2019 17:16:27 +0000 Subject: Coverity 350198: fixed jbig2_error() printf format / type mismatches. Unfortunately stdint_.h isn't available to jbig2dec code so we can't use PRIdSIZE. Have instead used %li with a cast to long. [This commit addresses all printf warnings from gcc -W -Wall; it probably fixes multiple similar coverity issues.] --- jbig2dec/jbig2_symbol_dict.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'jbig2dec/jbig2_symbol_dict.c') diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c index 7545ca435..7d0c3a1d0 100644 --- a/jbig2dec/jbig2_symbol_dict.c +++ b/jbig2dec/jbig2_symbol_dict.c @@ -664,14 +664,14 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx, /* SumatraPDF: prevent read access violation */ if (size < jbig2_huffman_offset(hs) || (size - jbig2_huffman_offset(hs) < (size_t) image->height * stride) || (size < jbig2_huffman_offset(hs))) { - jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding uncompressed (%d/%d)", image->height * stride, - size - jbig2_huffman_offset(hs)); + jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding uncompressed (%d/%li)", image->height * stride, + (long) (size - jbig2_huffman_offset(hs))); goto cleanup; } BMSIZE = (size_t) image->height * stride; jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, - "reading %dx%d uncompressed bitmap for %d symbols (%d bytes)", image->width, image->height, NSYMSDECODED - HCFIRSTSYM, BMSIZE); + "reading %dx%d uncompressed bitmap for %d symbols (%li bytes)", image->width, image->height, NSYMSDECODED - HCFIRSTSYM, (long) BMSIZE); for (j = 0; j < image->height; j++) { memcpy(dst, src, stride); @@ -683,12 +683,12 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx, /* SumatraPDF: prevent read access violation */ if (size < jbig2_huffman_offset(hs) || size < BMSIZE || size - jbig2_huffman_offset(hs) < BMSIZE) { - jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding (%d/%d)", BMSIZE, size - jbig2_huffman_offset(hs)); + jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding (%li/%li)", (long) BMSIZE, (long) (size - jbig2_huffman_offset(hs))); goto cleanup; } jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, - "reading %dx%d collective bitmap for %d symbols (%d bytes)", image->width, image->height, NSYMSDECODED - HCFIRSTSYM, BMSIZE); + "reading %dx%d collective bitmap for %d symbols (%li bytes)", image->width, image->height, NSYMSDECODED - HCFIRSTSYM, (long) BMSIZE); rparams.MMR = 1; code = jbig2_decode_generic_mmr(ctx, segment, &rparams, data + jbig2_huffman_offset(hs), BMSIZE, image); -- cgit v1.2.1