Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f70e66cccd5a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c82689085c76
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 24, 2019

  1. libheif: add patch for CVE-2019-11471

    @risicle
    risicle committed May 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    75f6109 View commit details

Commits on May 25, 2019

  1. Merge pull request #62024 from risicle/ris-libheif-CVE-2019-11471-r19.03 

    [r19.03] libheif: add patch for CVE-2019-11471
    @gebner
    gebner authored May 25, 2019
    Copy the full SHA
    c826890 View commit details
Showing with 17 additions and 0 deletions.
  1. +15 −0 pkgs/development/libraries/libheif/1.3.2-CVE-2019-11471.patch
  2. +2 −0 pkgs/development/libraries/libheif/default.nix
15 changes: 15 additions & 0 deletions pkgs/development/libraries/libheif/1.3.2-CVE-2019-11471.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014
--- a/libheif/heif_context.cc
+++ b/libheif/heif_context.cc
@@ -566,6 +566,11 @@
image->set_is_alpha_channel_of(refs[0]);

auto master_iter = m_all_images.find(refs[0]);
+ if (master_iter == m_all_images.end()) {
+ return Error(heif_error_Invalid_input,
+ heif_suberror_Nonexisting_item_referenced,
+ "Non-existing alpha image referenced");
+ }
master_iter->second->set_alpha_channel(image);
}

2 changes: 2 additions & 0 deletions pkgs/development/libraries/libheif/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
};

patches = [ ./1.3.2-CVE-2019-11471.patch ];

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libde265 x265 libpng libjpeg ];