diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-11-09 02:48:22 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-11-09 02:48:22 +0000 |
| commit | 9c4a88f019b9ff63c4c767e97b31002369b899f8 (patch) | |
| tree | cf3d203bd608a7b21b99854fea49e53dd9dbc7a4 /converter/bmp.h | |
| parent | 89477b37e4b679da49c9c578fdbb7690211f06a8 (diff) | |
| download | netpbm-mirror-9c4a88f019b9ff63c4c767e97b31002369b899f8.tar.gz netpbm-mirror-9c4a88f019b9ff63c4c767e97b31002369b899f8.tar.xz netpbm-mirror-9c4a88f019b9ff63c4c767e97b31002369b899f8.zip | |
Fix crash on large invalid value of ColorsUsed in BMP header
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1363 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/bmp.h')
| -rw-r--r-- | converter/bmp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/converter/bmp.h b/converter/bmp.h index b22be82f..8b2aa302 100644 --- a/converter/bmp.h +++ b/converter/bmp.h @@ -126,7 +126,7 @@ BMPleninfoheader(enum bmpClass const class) { static __inline__ unsigned int BMPlencolormap(enum bmpClass const class, unsigned int const bitcount, - int const cmapsize) { + unsigned int const cmapsize) { unsigned int lenrgb; unsigned int lencolormap; @@ -141,7 +141,7 @@ BMPlencolormap(enum bmpClass const class, case C_OS2: lenrgb = 3; break; } - if (cmapsize < 0) + if (!cmapsize) lencolormap = (1 << bitcount) * lenrgb; else lencolormap = cmapsize * lenrgb; @@ -216,7 +216,7 @@ BMPoffbits(enum bmpClass const class, static __inline__ unsigned int BMPlenfileGen(enum bmpClass const class, unsigned int const bitcount, - int const cmapsize, + unsigned int const cmapsize, unsigned int const x, unsigned int const y, unsigned int const imageSize, @@ -244,7 +244,7 @@ BMPlenfileGen(enum bmpClass const class, static __inline__ unsigned int BMPlenfile(enum bmpClass const class, unsigned int const bitcount, - int const cmapsize, + unsigned int const cmapsize, unsigned int const x, unsigned int const y) { /*---------------------------------------------------------------------------- |