You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.2 KiB
42 lines
1.2 KiB
2 years ago
|
From 1057a4a2d00b7d30cd7e827f577ee2ee640f508a Mon Sep 17 00:00:00 2001
|
||
|
|
From: DRC <information@libjpeg-turbo.org>
|
||
|
|
Date: Fri, 6 Aug 2021 13:41:15 -0500
|
||
|
|
Subject: [PATCH] SSE2/64-bit: Fix trans. segfault w/ malformed JPEG
|
||
|
|
|
||
|
|
Attempting to losslessly transform certain malformed JPEG images can
|
||
|
|
cause the nbits table index in the Huffman encoder to exceed 32768, so
|
||
|
|
we need to pad the SSE2 implementation of that table to 65536 entries as
|
||
|
|
we do with the C implementation.
|
||
|
|
|
||
|
|
Regression introduced by 087c29e07f7533ec82fd7eb1dafc84c29e7870ec
|
||
|
|
|
||
|
|
Fixes #543
|
||
|
|
---
|
||
|
|
simd/x86_64/jchuff-sse2.asm | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/simd/x86_64/jchuff-sse2.asm b/simd/x86_64/jchuff-sse2.asm
|
||
|
|
index 1770a84..7e5ca30 100644
|
||
|
|
--- a/simd/x86_64/jchuff-sse2.asm
|
||
|
|
+++ b/simd/x86_64/jchuff-sse2.asm
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
;
|
||
|
|
; jchuff-sse2.asm - Huffman entropy encoding (64-bit SSE2)
|
||
|
|
;
|
||
|
|
-; Copyright (C) 2009-2011, 2014-2016, 2019, D. R. Commander.
|
||
|
|
+; Copyright (C) 2009-2011, 2014-2016, 2019, 2021, D. R. Commander.
|
||
|
|
; Copyright (C) 2015, Matthieu Darbois.
|
||
|
|
; Copyright (C) 2018, Matthias Räncker.
|
||
|
|
;
|
||
|
|
@@ -83,6 +83,7 @@ times 1 << 11 db 12
|
||
|
|
times 1 << 12 db 13
|
||
|
|
times 1 << 13 db 14
|
||
|
|
times 1 << 14 db 15
|
||
|
|
+times 1 << 15 db 16
|
||
|
|
|
||
|
|
alignz 32
|
||
|
|
|
||
|
|
--
|
||
|
|
2.32.0
|
||
|
|
|