diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 00:05:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 00:05:21 +0000 |
commit | 1019c5c2a8c466a7dec60156e6c9803cc78d8bd5 (patch) | |
tree | 430811cec17db89e785eb7050c92cb3d02b7e367 /pkgs/tools/compression/pxz/_SC_ARG_MAX.patch | |
parent | 6721ae424aeb0ddb4feeabed1eadcbcce6b7c1f5 (diff) | |
parent | b09661d41fb93562fd53f31574dbf781b130ac44 (diff) | |
download | nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar.gz nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar.bz2 nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar.lz nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar.xz nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.tar.zst nixpkgs-1019c5c2a8c466a7dec60156e6c9803cc78d8bd5.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/tools/compression/pxz/_SC_ARG_MAX.patch')
-rw-r--r-- | pkgs/tools/compression/pxz/_SC_ARG_MAX.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147..00000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev <pashev.igor@gmail.com> -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); |