diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-11-07 00:20:30 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-11-07 00:20:30 +0000 |
| commit | de5ebb86911077d2d05fb4bc27e27c660ee8d0ff (patch) | |
| tree | 56373b7b63a0b12300783bd3ecb062ceaec4ab77 /converter/pbm | |
| parent | 1521736d42c031d6e2f48a1ba0f22d694400118d (diff) | |
| download | netpbm-mirror-de5ebb86911077d2d05fb4bc27e27c660ee8d0ff.tar.gz netpbm-mirror-de5ebb86911077d2d05fb4bc27e27c660ee8d0ff.tar.xz netpbm-mirror-de5ebb86911077d2d05fb4bc27e27c660ee8d0ff.zip | |
Fix detection of too-wide image
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4170 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/pbm')
| -rw-r--r-- | converter/pbm/g3topbm.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/converter/pbm/g3topbm.c b/converter/pbm/g3topbm.c index 5d98fcb2..02641eb5 100644 --- a/converter/pbm/g3topbm.c +++ b/converter/pbm/g3topbm.c @@ -527,7 +527,7 @@ readFaxRow(struct BitStream * const bitStreamP, done = FALSE; while (!done) { - if (col >= MAXCOLS) { + if (col > MAXCOLS) { pm_asprintf(exceptionP, "Line is too long for this program to " "handle -- longer than %u columns", MAXCOLS); done = TRUE; @@ -552,12 +552,11 @@ readFaxRow(struct BitStream * const bitStreamP, curcode = (curcode << 1) | bit; ++curlen; - if (curlen > 11 && curcode == 0x00) { - if (++fillbits > MAXFILLBITS) - pm_error("Encountered %u consecutive fill bits. " - "Aborting", fillbits); - } - else if (curlen - fillbits > 13) { + if (curlen > 11 && curcode == 0x00) { + if (++fillbits > MAXFILLBITS) + pm_error("Encountered %u consecutive fill bits. " + "Aborting", fillbits); + } else if (curlen - fillbits > 13) { formatBadCodeException(exceptionP, col, curlen, curcode); done = TRUE; } else if (curcode != 0) { |