diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch')
| -rw-r--r-- | package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch b/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch deleted file mode 100644 index 862aae2a5a..0000000000 --- a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Mon Sep 17 00:00:00 2001 -From: erouault <erouault> -Date: Wed, 11 Jan 2017 12:15:01 +0000 -Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in - JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2653 - -Fixes CVE-2017-7595 - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - libtiff/tif_jpeg.c | 7 +++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c -index 38595f98..6c17c388 100644 ---- a/libtiff/tif_jpeg.c -+++ b/libtiff/tif_jpeg.c -@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif) - case PHOTOMETRIC_YCBCR: - sp->h_sampling = td->td_ycbcrsubsampling[0]; - sp->v_sampling = td->td_ycbcrsubsampling[1]; -+ if( sp->h_sampling == 0 || sp->v_sampling == 0 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "Invalig horizontal/vertical sampling value"); -+ return (0); -+ } -+ - /* - * A ReferenceBlackWhite field *must* be present since the - * default value is inappropriate for YCbCr. Fill in the --- -2.11.0 - |
