diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
commit | a76585e5535f433d37c0900cf0b2d3c9d3b3461c (patch) | |
tree | 007befec20e2a33117256eeee11b7c642179dad4 /gnu/packages/patches/openjpeg-CVE-2017-14041.patch | |
parent | 1dc32c2961402c946c25e5a1aabe79a30cce3cff (diff) | |
parent | c427fda233a7da0c8eb27e244a562c51d3835503 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/openjpeg-CVE-2017-14041.patch')
-rw-r--r-- | gnu/packages/patches/openjpeg-CVE-2017-14041.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/openjpeg-CVE-2017-14041.patch b/gnu/packages/patches/openjpeg-CVE-2017-14041.patch new file mode 100644 index 0000000000..6e3fccf3c0 --- /dev/null +++ b/gnu/packages/patches/openjpeg-CVE-2017-14041.patch @@ -0,0 +1,25 @@ +http://openwall.com/lists/oss-security/2017/08/28/4 +https://github.com/uclouvain/openjpeg/commit/e5285319229a5d77bf316bb0d3a6cbd3cb8666d9.patch + +From e5285319229a5d77bf316bb0d3a6cbd3cb8666d9 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Fri, 18 Aug 2017 13:39:20 +0200 +Subject: [PATCH] pgxtoimage(): fix write stack buffer overflow (#997) + +--- + src/bin/jp2/convert.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c +index 5459f7d44..e606c9be7 100644 +--- a/src/bin/jp2/convert.c ++++ b/src/bin/jp2/convert.c +@@ -1185,7 +1185,7 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) + } + + fseek(f, 0, SEEK_SET); +- if (fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d", temp, &endian1, ++ if (fscanf(f, "PG%31[ \t]%c%c%31[ \t+-]%d%31[ \t]%d%31[ \t]%d", temp, &endian1, + &endian2, signtmp, &prec, temp, &w, temp, &h) != 9) { + fclose(f); + fprintf(stderr, |