diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2007-11-26 20:38:34 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2007-11-26 20:38:34 (GMT) |
| commit | 55f6adc5b76aed80e9078d161d890051fecbc651 (patch) | |
| tree | 4b3c4719ed27a5a97869113ec8a9418f1c35be81 /generic/tkImgPPM.c | |
| parent | 671bcba7bb5831707282a085723aaf9c2812fd9a (diff) | |
| download | tk-55f6adc5b76aed80e9078d161d890051fecbc651.zip tk-55f6adc5b76aed80e9078d161d890051fecbc651.tar.gz tk-55f6adc5b76aed80e9078d161d890051fecbc651.tar.bz2 | |
* generic/tkImgPPM.c (StringReadPPM): Corrected a comparison
whose sense was reversed that resulted in reading beyond the
end of the input buffer on malformed PPM data. [Bug #1822391]
* tests/imgPPM.test (imgPPM-4.1): Added test case that
exercises [Bug #1822391].
Diffstat (limited to 'generic/tkImgPPM.c')
| -rw-r--r-- | generic/tkImgPPM.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c index 45063c9..b4302e4 100644 --- a/generic/tkImgPPM.c +++ b/generic/tkImgPPM.c @@ -13,7 +13,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPPM.c,v 1.19 2007/09/07 00:34:52 dgp Exp $ + * RCS: @(#) $Id: tkImgPPM.c,v 1.20 2007/11/26 20:38:35 kennykb Exp $ */ #include "tkInt.h" @@ -538,7 +538,7 @@ StringReadPPM( * We have all the data in memory, so write everything in one go. */ - if (block.pitch*height < dataSize) { + if (block.pitch*height > dataSize) { Tcl_AppendResult(interp, "truncated PPM data", NULL); return TCL_ERROR; } |