mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
7f6b53170f
CVE-2017-17784, CVE-2017-17785, CVE-2017-17786, CVE-2017-17787, CVE-2017-17789 Fixes #8350 CVE-2017-17788 applies only to >= v2.9.6
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 22e2571c25425f225abdb11a566cc281fca6f366 Mon Sep 17 00:00:00 2001
|
|
From: Jehan <jehan@girinstud.io>
|
|
Date: Wed, 20 Dec 2017 13:26:26 +0100
|
|
Subject: plug-ins: TGA 16-bit RGB (without alpha bit) is also valid.
|
|
|
|
According to some spec on the web, 16-bit RGB is also valid. In this
|
|
case, the last bit is simply ignored (at least that's how it is
|
|
implemented right now).
|
|
|
|
(cherry picked from commit 8ea316667c8a3296bce2832b3986b58d0fdfc077)
|
|
---
|
|
plug-ins/common/file-tga.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
|
|
index 426acc2..eb14a1d 100644
|
|
--- a/plug-ins/common/file-tga.c
|
|
+++ b/plug-ins/common/file-tga.c
|
|
@@ -568,7 +568,8 @@ load_image (const gchar *filename,
|
|
info.bpp != 24 && info.bpp != 32) ||
|
|
((info.bpp == 15 || info.bpp == 24) &&
|
|
info.alphaBits != 0) ||
|
|
- (info.bpp == 16 && info.alphaBits != 1) ||
|
|
+ (info.bpp == 16 && info.alphaBits != 1 &&
|
|
+ info.alphaBits != 0) ||
|
|
(info.bpp == 32 && info.alphaBits != 8))
|
|
{
|
|
g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
|
|
--
|
|
cgit v0.12
|
|
|