Petr Gajdos
545684f568
+ gd-CVE-2016-6132.patch
* CVE-2016-6214 [bsc#991436]
+ gd-CVE-2016-6214.patch
OBS-URL: https://build.opensuse.org/package/show/graphics/gd?expand=0&rev=29
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 921e590565deb033acafcfa9063b4563200b14b5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
|
|
Date: Tue, 12 Jul 2016 11:24:09 +0200
|
|
Subject: [PATCH] Fix #247, A read out-of-bands was found in the parsing of TGA
|
|
files
|
|
|
|
---
|
|
src/gd_tga.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/gd_tga.c b/src/gd_tga.c
|
|
index ef20f86..07f3c86 100644
|
|
--- a/src/gd_tga.c
|
|
+++ b/src/gd_tga.c
|
|
@@ -237,7 +237,10 @@ int read_image_tga( gdIOCtx *ctx, oTga *tga )
|
|
return -1;
|
|
}
|
|
|
|
- gdGetBuf(conversion_buffer, image_block_size, ctx);
|
|
+ if (gdGetBuf(conversion_buffer, image_block_size, ctx) != image_block_size) {
|
|
+ gdFree(conversion_buffer);
|
|
+ return -1;
|
|
+ }
|
|
|
|
while (buffer_caret < image_block_size) {
|
|
tga->bitmap[buffer_caret] = (int) conversion_buffer[buffer_caret];
|
|
@@ -261,7 +264,11 @@ int read_image_tga( gdIOCtx *ctx, oTga *tga )
|
|
return -1;
|
|
}
|
|
|
|
- gdGetBuf( conversion_buffer, image_block_size, ctx );
|
|
+ if (gdGetBuf(conversion_buffer, image_block_size, ctx) != image_block_size) {
|
|
+ gdFree(conversion_buffer);
|
|
+ gdFree(decompression_buffer);
|
|
+ return -1;
|
|
+ }
|
|
|
|
buffer_caret = 0;
|
|
|
|
|