gd: 2.1.1 -> 2.2.1
This commit is contained in:
parent
8a304cc228
commit
7d580b8339
@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/gd_gd2.c b/src/gd_gd2.c
|
|
||||||
index 6f28461..a50b33d 100644
|
|
||||||
--- a/src/gd_gd2.c
|
|
||||||
+++ b/src/gd_gd2.c
|
|
||||||
@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy,
|
|
||||||
if (gdGetInt (&cidx[i].size, in) != 1) {
|
|
||||||
goto fail2;
|
|
||||||
};
|
|
||||||
+ if (cidx[i].offset < 0 || cidx[i].size < 0)
|
|
||||||
+ goto fail2;
|
|
||||||
};
|
|
||||||
*chunkIdx = cidx;
|
|
||||||
};
|
|
@ -3,6 +3,7 @@
|
|||||||
, zlib
|
, zlib
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, libpng
|
, libpng
|
||||||
|
, libwebp
|
||||||
, libtiff ? null
|
, libtiff ? null
|
||||||
, libXpm ? null
|
, libXpm ? null
|
||||||
, fontconfig
|
, fontconfig
|
||||||
@ -11,19 +12,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gd-${version}";
|
name = "gd-${version}";
|
||||||
version = "2.1.1";
|
version = "2.2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
|
url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
|
||||||
sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls";
|
sha256 = "0xmrqka1ggqgml84xbmkw1y0r0lg7qn657v5b1my8pry92p651vh";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
./CVE-2016-3074.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ];
|
buildInputs = [ zlib fontconfig freetype libjpeg libpng libwebp libtiff libXpm ];
|
||||||
|
|
||||||
outputs = [ "dev" "out" "bin" ];
|
outputs = [ "dev" "out" "bin" ];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user