Commit 97c78583 authored by Henner Zeller's avatar Henner Zeller
Browse files

libsixel: 1.10.3 -> 1.10.5

parent 9d2feae3
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
diff --git a/src/stb_image.h b/src/stb_image.h
index f12c30b..526281c 100644
--- a/src/stb_image.h
+++ b/src/stb_image.h
@@ -1534,6 +1534,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r
    int i,j;
    unsigned char *good;
 
+   if (data == NULL) return data;
    if (req_comp == img_n) return data;
    STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
 
+2 −7
Original line number Diff line number Diff line
@@ -10,20 +10,15 @@
}:
stdenv.mkDerivation rec {
  pname = "libsixel";
  version = "1.10.3";
  version = "1.10.5";

  src = fetchFromGitHub {
    owner = "libsixel";
    repo = "libsixel";
    rev = "v${version}";
    sha256 = "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d";
    hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck=";
  };

  patches = [
    # https://github.com/NixOS/nixpkgs/issues/160670
    ./fix-CVE-2021-45340.patch
  ];

  buildInputs = [
    gdk-pixbuf
    gd