Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3d2dbb72b98e43ea1c0c52cbe2c53f3cfb02179)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3d2dbb72b98e43ea1c0c52cbe2c53f3cfb02179)
  • Date: Tue, 12 Nov 2019 19:53:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

graphics-libs/libjpeg-turbo/DETAILS | 2
graphics-libs/libjpeg-turbo/HISTORY | 5 +
graphics-libs/libjpeg-turbo/PRE_BUILD | 4 +
graphics-libs/libjpeg-turbo/patches/cve-2019-2201.patch | 51
++++++++++++++++
4 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit c3d2dbb72b98e43ea1c0c52cbe2c53f3cfb02179
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

graphics-libs/libjpeg-turbo: SECURITY_PATCH++, fixed signed 64-bit int
overflow

diff --git a/graphics-libs/libjpeg-turbo/CONFIGURE
b/graphics-libs/libjpeg-turbo/CONFIGURE
old mode 100644
new mode 100755
diff --git a/graphics-libs/libjpeg-turbo/DETAILS
b/graphics-libs/libjpeg-turbo/DETAILS
index 23fd2d1..7e04b9a 100755
--- a/graphics-libs/libjpeg-turbo/DETAILS
+++ b/graphics-libs/libjpeg-turbo/DETAILS
@@ -2,7 +2,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libjpeg-turbo
VERSION=2.0.3

SOURCE_HASH=sha512:745cc3d50b43dd84721bc3c341d561ffd7f54eda5bbe2d56cad62f4b51ea76da3b18aba9ca694a9db79379aba7a9971cb146387979e96ca6ece950871276cf2f
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${VERSION}.tar.gz
diff --git a/graphics-libs/libjpeg-turbo/HISTORY
b/graphics-libs/libjpeg-turbo/HISTORY
index 72eedbc..24bf1f5 100644
--- a/graphics-libs/libjpeg-turbo/HISTORY
+++ b/graphics-libs/libjpeg-turbo/HISTORY
@@ -1,3 +1,8 @@
+2019-11-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++, (CVE-2019-2201)
+ * CONFIGURE: chmod +x
+ * PRE_BUILD, patches/cve-2019-2201.patch: added
+
2019-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.3

diff --git a/graphics-libs/libjpeg-turbo/PRE_BUILD
b/graphics-libs/libjpeg-turbo/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/graphics-libs/libjpeg-turbo/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/graphics-libs/libjpeg-turbo/patches/cve-2019-2201.patch
b/graphics-libs/libjpeg-turbo/patches/cve-2019-2201.patch
new file mode 100644
index 0000000..6cc70b7
--- /dev/null
+++ b/graphics-libs/libjpeg-turbo/patches/cve-2019-2201.patch
@@ -0,0 +1,51 @@
+From c30b1e72dac76343ef9029833d1561de07d29bad Mon Sep 17 00:00:00 2001
+From: DRC <information AT libjpeg-turbo.org>
+Date: Tue, 12 Nov 2019 12:27:22 -0600
+Subject: [PATCH] 64-bit tjbench: Fix signed int overflow/segfault
+
+... that occurred when attempting to decompress images with more than
+715827882 (2048*1024*1024 / 3) pixels.
+
+Fixes #388
+---
+ ChangeLog.md | 4 ++++
+ tjbench.c | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 4d6960f3d..da160f0f1 100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -8,6 +8,10 @@
+ 64-bit libjpeg-turbo SDK for Visual C++ were installed on the same system,
only
+ one of them could be uninstalled.
+
++2. Fixed a signed integer overflow and subsequent segfault that occurred
when
++attempting to decompress images with more than 715827882 pixels using the
++64-bit C version of TJBench.
++
+
+ 2.0.3
+ =====
+diff --git a/tjbench.c b/tjbench.c
+index a7d397318..13a5bde62 100644
+--- a/tjbench.c
++++ b/tjbench.c
+@@ -171,7 +171,7 @@ static int decomp(unsigned char *srcBuf, unsigned char
**jpegBuf,
+ }
+ /* Set the destination buffer to gray so we know whether the decompressor
+ attempted to write to it */
+- memset(dstBuf, 127, pitch * scaledh);
++ memset(dstBuf, 127, (size_t)pitch * scaledh);
+
+ if (doYUV) {
+ int width = doTile ? tilew : scaledw;
+@@ -193,7 +193,7 @@ static int decomp(unsigned char *srcBuf, unsigned char
**jpegBuf,
+ double start = getTime();
+
+ for (row = 0, dstPtr = dstBuf; row < ntilesh;
+- row++, dstPtr += pitch * tileh) {
++ row++, dstPtr += (size_t)pitch * tileh) {
+ for (col = 0, dstPtr2 = dstPtr; col < ntilesw;
+ col++, tile++, dstPtr2 += ps * tilew) {
+ int width = doTile ? min(tilew, w - col * tilew) : scaledw;



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c3d2dbb72b98e43ea1c0c52cbe2c53f3cfb02179), Pavel Vinogradov, 11/12/2019

Archive powered by MHonArc 2.6.24.

Top of Page