summaryrefslogtreecommitdiff
path: root/jdsample.c
diff options
context:
space:
mode:
authorJonathan Wright <jonathan.wright@arm.com>2020-08-05 11:42:22 +0100
committerJonathan Wright <jonathan.wright@arm.com>2020-08-07 17:04:34 +0100
commitdb870dfef8ab97950b4bdf22c66dd6c18326460b (patch)
tree9862c1aa45d014815ec798992ecb43eff1bc8d42 /jdsample.c
parent341272d909285da90e44015ca41f956fd00b9dd8 (diff)
Update libjpeg-turbo to v2.0.5
Update Chromium's copy of libjpeg-turbo to the latest stable upstream release (v2.0.5) and reapply our local changes documented in README.chromium. This update addresses three CVEs - CVE-2018-19664, CVE-2018-20330, CVE-2018-20330 - that do not affect Chromium. The fixes do, however, satisfy UBSan - allowing Chromium's libjpeg-turbo to be used in AOSP. Cherry-pick one additional change[1] from upstream to prevent AArch64 Windows builds from failing. [1] https://github.com/libjpeg-turbo/libjpeg-turbo/commit/6ee5d5f568fda1a7c6a49dd8995f2d89866ee42d Bug: 922430 Bug: https://issuetracker.google.com/135180511 Change-Id: I146fe82f7a016ce393eb0d37aebe0b7c2492a9da
Diffstat (limited to 'jdsample.c')
-rw-r--r--jdsample.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/jdsample.c b/jdsample.c
index 59257e1..49016ce 100644
--- a/jdsample.c
+++ b/jdsample.c
@@ -8,6 +8,7 @@
* Copyright (C) 2010, 2015-2016, D. R. Commander.
* Copyright (C) 2014, MIPS Technologies, Inc., California.
* Copyright (C) 2015, Google, Inc.
+ * Copyright (C) 2019, Arm Limited.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*