aboutsummaryrefslogtreecommitdiff
Copied from Debian.

From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 14 Sep 2015 18:24:56 +0200
Subject: fix infinite loop when extracting empty bzip2 data
Bug-Debian: https://bugs.debian.org/802160
Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944
Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339

---
 extract.c | 6 ++++++
 1 file changed, 6 insertions(+)

--- a/extract.c
+++ b/extract.c
@@ -2728,6 +2728,12 @@
     int repeated_buf_err;
     bz_stream bstrm;
 
+    if (G.incnt <= 0 && G.csize <= 0L) {
+        /* avoid an infinite loop */
+        Trace((stderr, "UZbunzip2() got empty input\n"));
+        return 2;
+    }
+
 #if (defined(DLL) && !defined(NO_SLIDE_REDIR))
     if (G.redirect_slide)
         wsize = G.redirect_size, redirSlide = G.redirect_buffer;
uts]: Add PKG-CONFIG. [inputs]: Add GRAPHITE2. (rust-tectonic-bundles): Update to 0.3. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-IO-BASE to 0.4. [native-inputs]: Add PKG-CONFIG. [inputs]: Add OPENSSL and ZLIB. (rust-tectonic-docmodel): Update to 0.2.0. [arguments]: Do not skip build. (rust-tectonic-engine-xetex): Update to 0.4.1. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-PDF-IO to 0.4 and RUST-TECTONIC-XETEX-LAYOUT to 0.2. [native-inputs]: Add PKG-CONFIG. [inputs]: Add FONTCONFIG, FREETYPE, GRAPHITE2, ICU4C and ZLIB. (rust-tectonic-engine-xdvipdfmx): Update to 0.4.0. [arguments]: Do not skip build. <#:cargo-inputs>: Remove RUST-CBINDGEN, update RUST-TECTONIC-BRIDGE-CORE to 0.3 and RUST-TECTONIC-PDF-IO to 0.4. [native-inputs]: Add PKG-CONFIG. [inputs]: Add LIBPNG and ZLIB. (rust-tectonic-pdf-io): Update to 0.4. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-BRIDGE-CORE to 0.3. (rust-tectonic-xetex-layout): Update to 0.2.1. [arguments]: Do not skip build. <#:cargo-inputs>: Update RUST-TECTONIC-BRIDGE-CORE to 0.3. [native-inputs]: Add PKG-CONFIG. [inputs]: Add FONTCONFIG, FREETYPE, GRAPHITE2, ICU4C and ZLIB. Nicolas Goaziou 2022-12-09gnu: Add htmlq....* gnu/packages/rust-apps.scm (htmlq): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Greg Hogan 2022-11-30gnu: rust-svd-parser-0.9: Rename to rust-svd-parser-0.10....* gnu/packages/crates-io.scm (rust-svd-parser-0.9): Rename to rust-svd-parser-0.10. * gnu/packages/rust-apps.scm (svd2rust)[cargo-inputs]: Adjust accordingly. Efraim Flashner 2022-11-30gnu: crates-io: Resort some unsorted packages....* gnu/packages/crates-io.scm (rust-clap-conf-0.1, rust-rt-format-0.8, rust-enquote-1, rust-im-rc-15, rust-impl-codec-0.5, rust-impl-rlp-0.3, rust-impl-serde-0.3, rust-impl-trait-for-tuples-0.2, rust-indicatif-0.16, rust-inflections-1, rust-pam-sys-0.5, rust-rustc-workplace-hack-1, rust-svd-parser-0.9, rust-svgtypes-0.5, rust-sxd-document-0.3, rust-sxd-xpath-0.4, rust-xi-unicode-0.3): Sort into their proper places. (skim, skim-0.7, svd2rust): Move to ... * gnu/packages/rust-apps.scm: ... here. Efraim Flashner 2022-11-30gnu: gnuzilla.scm: Move rust packages to standard locations....* gnu/packages/gnuzilla.scm (rust-textwrap-0.15-promise, rust-lex-0.2, rust-clap-derive-3.2-promise): Remove variables. (icecat,icedove)[native-inputs]: Replace rust-cbindgen-0.23-promise with rust-cbindgen-0.23. (rust-cbindgen-0.24-promise, rust-cbindgen-0.23-promise): Move to ... * gnu/packages/rust-apps.scm (rust-cbindgen-0.24, rust-cbindgen-0.23): ... here. Rename without '-promise' suffix. Efraim Flashner 2022-11-27gnu: zoxide: Update to 0.8.3....* gnu/packages/rust-apps.scm: Sort module imports. (zoxide): Update to 0.8.3. [arguments]: Use G-expressions. <#:phases>{'use-older-rust}: New phase. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> ( 2022-11-28gnu: Add swayr....* gnu/packages/rust-apps.scm (swayr): New variable. Signed-off-by: Andrew Tropin <andrew@trop.in> Nicolas Graves 2022-11-28Revert "gnu: Add swayr."...This reverts commit b8a000b33b907ed161aef3cd08430e0905b4344f. Andrew Tropin 2022-11-28gnu: Add swayr....* gnu/packages/rust-apps.scm (swayr): New variable. Signed-off-by: Andrew Tropin <andrew@trop.in> Nicolas Goaziou 2022-10-24gnu: rust-cargo-edit: Update to 0.10.4....* gnu/packages/rust-apps.scm (rust-cargo-edit): Update to 0.10.4. [arguments]: Don't skip build. Don't install source. [cargo-inputs]: Remove rust-atty-0.2, rust-error-chain-0.12, rust-structopt-0.3. Replace rust-cargo-metadata-0.14 with 0.15, rust-crates-index-0.17 with 0.18, rust-git2-0.12 with 0.14, rust-toml-edit-0.3 with 0.14, rust-ureq-1 with 2. Add rust-anyhow-1, rust-clap-3, rust-concolor-control-0.0.7, rust-indexmap-1, rust-native-tls-0.2. Sort alphabetically. [cargo-development-inputs]: Remove rust-pretty-assertions-0.6. Add rust-snapbox-0.2, rust-trycmd-0.13, rust-url-2. [inputs]: Replace libgit2-1.3 with libgit. Efraim Flashner 2022-10-24gnu: rust-cargo-edit: Add missing inputs....* gnu/packages/rust-apps.scm (rust-cargo-edit)[native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3, libssh2, openssl, zlib. Efraim Flashner 2022-10-24gnu: rust-cargo-edit: Rename from rust-cargo-edit-0.8....* gnu/packages/rust-apps.scm (rust-cargo-edit): Rename from ... (rust-cargo-edit-0.8): ... this. Redefine as a deprecated package. Efraim Flashner 2022-10-24gnu: rust-cargo-edit-0.8: Move to rust-apps.scm....* gnu/packages/crates-io.scm (rust-cargo-edit-0.8): Move to ... * gnu/packages/rust-apps.scm (rust-cargo-edit-0.8): ... here. Efraim Flashner 2022-10-24gnu: rust-swc: Add missing inputs....* gnu/packages/rust-apps.scm (rust-swc)[cargo-inputs]: Add rust-ordered-float-1, rust-phf-0.8. Efraim Flashner 2022-10-24gnu: rust-swc: Rename from rust-swc-1....* gnu/packages/rust-apps.scm (rust-swc-1): Rename to ... (rust-swc): ... this. (rust-swc-1): Add as deprecated package. Efraim Flashner 2022-10-24gnu: rust-swc-1: Move to rust-apps....* gnu/packages/crates-io.scm (rust-swc-1): Move from here ... * gnu/packages/rust-apps.scm (rust-swc-1): ... to here. Efraim Flashner 2022-10-22gnu: git-interactive-rebase-tool: Fix build....* gnu/packages/rust-apps.scm (git-interactive-rebase-tool) [native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3. Efraim Flashner 2022-10-22gnu: git-absorb: Fix build....* gnu/packages/rust-apps.scm (git-absorb)[arguments]: Adjust custom 'relax-version-requirements phase to make all crate requirements follow standard cargo semver levels. [native-inputs]: Add pkg-config. [inputs]: Add libgit2-1.3. Efraim Flashner 2022-09-28gnu: exa: Only build with pandoc when supported....* gnu/packages/rust-apps.scm (exa)[arguments]: Adjust custom 'build-manual phase to only build when pandoc is available. Adjust custom 'install-extras to only install man pages when they are available. [native-inputs]: Only include pandoc on systems where it is supported. Efraim Flashner 2022-09-28gnu: exa: Don't install source....* gnu/packages/rust-apps.scm (exa)[arguments]: Add flag to not install the package source. Efraim Flashner 2022-09-28gnu: exa: Update to 0.10.1....* gnu/packages/rust-apps.scm (exa): Update to 0.10.1. [arguments]: Delete custom phase 'disable-failing-tests. Add custom 'build-manual phase. Remove trailing #t from phases. [cargo-inputs]: Replace rust-datetime-0.4 with 0.5, rust-git2-0.9 with 0.13, rust-number-prefix-0.3 with 0.4, rust-users-0.9 with 0.11, rust-zoneinfo-compiled-0.4 with 0.5. [cargo-native-inputs]: Replace rust-datetime-0.4 with 0.5. [native-inputs]: Add pandoc. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> gyara 2022-09-24gnu: Add rot8....* gnu/packages/rust-apps.scm (rot8): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> M 2022-09-09gnu: Explicitly use OpenSSL 1.1 in more packages....* gnu/packages/rust-apps.scm (rust-cargo-c)[inputs]: Change from OPENSSL to OPENSSL-1.1. * gnu/packages/security-token.scm (opensc)[inputs]: Likewise. * gnu/packages/spice.scm (spice, spice-gtk)[propagated-inputs]: Likewise. * gnu/packages/web.scm (serf)[propagated-inputs]: Likewise. Marius Bakke 2022-09-05gnu: Add rust-cbindgen-0.17....* gnu/packages/rust-apps.scm (rust-cbindgen-0.17): New variable. Ricardo Wurmus 2022-09-01gnu: Add treefmt....* gnu/packages/rust-apps.scm (treefmt): New variable. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> Gabriel Arazas