manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jbig2dec: update to 0.14.

This commit is contained in:
Michael Gehring 2017-10-05 07:08:21 +00:00
parent 6a0df14cfd
commit 68b519c202
4 changed files with 3 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
srcpkgs/jbig2dec/patches/CVE-2017-7885.patch
View File

@ -1,13 +0,0 @@
diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c
index 4acaba9..36225cb 100644 (file)
--- jbig2_symbol_dict.c
+++ jbig2_symbol_dict.c
@@ -629,7 +629,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
byte *dst = image->data;
/* SumatraPDF: prevent read access violation */
- if (size - jbig2_huffman_offset(hs) < image->height * stride) {
+ if ((size - jbig2_huffman_offset(hs) < image->height * stride) || (size < jbig2_huffman_offset(hs))) {
jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding (%d/%d)", image->height * stride,
size - jbig2_huffman_offset(hs));
jbig2_image_release(ctx, image);

15
srcpkgs/jbig2dec/patches/CVE-2017-7975.patch
View File

@ -1,15 +0,0 @@
diff --git a/jbig2dec/jbig2_huffman.c b/jbig2dec/jbig2_huffman.c
index 511e461..b4189a1 100644 (file)
--- jbig2_huffman.c
+++ jbig2_huffman.c
@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
if (PREFLEN == CURLEN) {
int RANGELEN = lines[CURTEMP].RANGELEN;
- int start_j = CURCODE << shift;
- int end_j = (CURCODE + 1) << shift;
+ uint32_t start_j = CURCODE << shift;
+ uint32_t end_j = (CURCODE + 1) << shift;
byte eflags = 0;
if (end_j > max_j) {

29
srcpkgs/jbig2dec/patches/CVE-2017-7976.patch
View File

@ -1,29 +0,0 @@
diff --git a/jbig2dec/jbig2_image.c b/jbig2dec/jbig2_image.c
index 94e5a4c..00f966b 100644 (file)
--- jbig2_image.c
+++ jbig2_image.c
@@ -256,7 +256,7 @@ jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, int x, int
/* general OR case */
s = ss;
d = dd = dst->data + y * dst->stride + leftbyte;
- if (d < dst->data || leftbyte > dst->stride || h * dst->stride < 0 || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride) {
+ if (d < dst->data || leftbyte > dst->stride || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride) {
return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "preventing heap overflow in jbig2_image_compose");
}
if (leftbyte == rightbyte) {
diff --git a/jbig2dec/jbig2_image.c b/jbig2dec/jbig2_image.c
index 661d0a5..ae161b9 100644 (file)
--- jbig2_image.c
+++ jbig2_image.c
@@ -263,7 +263,8 @@ jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, int x, int
/* general OR case */
s = ss;
d = dd = dst->data + y * dst->stride + leftbyte;
- if (d < dst->data || leftbyte > dst->stride || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride) {
+ if (d < dst->data || leftbyte > dst->stride || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride ||
+ s - leftbyte + (h - 1) * src->stride + rightbyte > src->data + src->height * src->stride) {
return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "preventing heap overflow in jbig2_image_compose");
}
if (leftbyte == rightbyte) {

6
srcpkgs/jbig2dec/template
View File

@ -1,7 +1,7 @@
# Template file for 'jbig2dec'
pkgname=jbig2dec
version=0.13
revision=2
version=0.14
revision=1
build_style=gnu-configure
makedepends="libpng-devel"
short_desc="Decoder implementation of the JBIG2 image compression format"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="AGPL-3"
homepage="http://www.ghostscript.com/jbig2dec.html"
distfiles="http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-${version}.tar.gz"
checksum=5aaca0070992cc2e971e3bb2338ee749495613dcecab4c868fc547b4148f5311
checksum=21b498c3ba566f283d02946f7e78e12abbad89f12fe4958974e50882c185014c
jbig2dec-devel_package() {
short_desc+=" - development files"