diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-31 02:02:14 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-31 02:02:14 +0000 |
| commit | deb915ad698c0734b988f7096a7b3071e3ea269b (patch) | |
| tree | 23423c39e5388ac4e843eeb367690f80c8ca2b09 /user/libjpeg-turbo/CVE-2020-13790.patch | |
| parent | c79a94fd03f8d92aaccc55fcf696065a235ba36b (diff) | |
| parent | e7be4c45525c1ae57caeea4e83e44df02f7b51c1 (diff) | |
| download | packages-deb915ad698c0734b988f7096a7b3071e3ea269b.tar.gz packages-deb915ad698c0734b988f7096a7b3071e3ea269b.tar.bz2 packages-deb915ad698c0734b988f7096a7b3071e3ea269b.tar.xz packages-deb915ad698c0734b988f7096a7b3071e3ea269b.zip | |
Merge branch 'libjpeg-turbo' into 'master'
user/libjpeg-turbo: Upgrade to 2.0.5
See merge request adelie/packages!552
Diffstat (limited to 'user/libjpeg-turbo/CVE-2020-13790.patch')
| -rw-r--r-- | user/libjpeg-turbo/CVE-2020-13790.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch deleted file mode 100644 index aaeec0c9c..000000000 --- a/user/libjpeg-turbo/CVE-2020-13790.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001 -From: DRC <information@libjpeg-turbo.org> -Date: Tue, 2 Jun 2020 14:15:37 -0500 -Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM - -This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to -include binary PPM files with maximum values < 255, thus preventing a -malformed binary PPM input file with those specifications from -triggering an overrun of the rescale array and potentially crashing -cjpeg, TJBench, or any program that uses the tjLoadImage() function. - -Fixes #433 - -diff --git a/rdppm.c b/rdppm.c -index 87bc33090..a8507b902 100644 ---- a/rdppm.c -+++ b/rdppm.c -@@ -5,7 +5,7 @@ - * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009 by Bill Allombert, Guido Vollbeding. - * libjpeg-turbo Modifications: -- * Copyright (C) 2015-2017, D. R. Commander. -+ * Copyright (C) 2015-2017, 2020, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, -- (size_t)(((long)maxval + 1L) * -+ (size_t)(((long)MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long)maxval; val++) { |