diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-15 10:39:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-15 10:39:44 (GMT) |
| commit | b0eddb29b1240282167b039fb78644bed3e0cf46 (patch) | |
| tree | 4f9259e96e96b897b59a75e58fac56a551a3bd14 /generic/tkImgPhoto.c | |
| parent | 932b3dbd904471176b4a9b35403ed423b7c2ddc2 (diff) | |
| parent | 458337a57e04538b5ccfc312e9c0cfc7da8cbbcd (diff) | |
| download | tk-b0eddb29b1240282167b039fb78644bed3e0cf46.zip tk-b0eddb29b1240282167b039fb78644bed3e0cf46.tar.gz tk-b0eddb29b1240282167b039fb78644bed3e0cf46.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkImgPhoto.c')
| -rw-r--r-- | generic/tkImgPhoto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 0330ade..77526c1 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -3264,8 +3264,8 @@ Tk_PhotoPutBlock( sourceBlock = *blockPtr; memToFree = NULL; if (modelPtr->pix32 && (sourceBlock.pixelPtr >= modelPtr->pix32) - && (sourceBlock.pixelPtr < modelPtr->pix32 + modelPtr->width) - * modelPtr->height * 4) { + && (sourceBlock.pixelPtr < modelPtr->pix32 + modelPtr->width + * modelPtr->height * 4)) { /* * Fix 5c51be6411: avoid reading * @@ -3710,8 +3710,8 @@ Tk_PhotoPutZoomedBlock( sourceBlock = *blockPtr; memToFree = NULL; if (modelPtr->pix32 && (sourceBlock.pixelPtr >= modelPtr->pix32) - && (sourceBlock.pixelPtr < modelPtr->pix32 + modelPtr->width) - * modelPtr->height * 4) { + && (sourceBlock.pixelPtr < modelPtr->pix32 + modelPtr->width + * modelPtr->height * 4)) { /* * Fix 5c51be6411: avoid reading * |