rebase cont (patch7): remove upstreamed patch
Version: 4.2.4.4-1
This commit is contained in:
parent
62a66420ee
commit
9009c4d978
@ -1,34 +0,0 @@
|
||||
diff -urNp ncompress-4.2.4-orig/compress42.c ncompress-4.2.4/compress42.c
|
||||
--- ncompress-4.2.4-orig/compress42.c 2008-12-01 13:50:17.000000000 +0100
|
||||
+++ ncompress-4.2.4/compress42.c 2008-12-01 13:53:03.000000000 +0100
|
||||
@@ -132,6 +132,7 @@
|
||||
*/
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
@@ -696,7 +697,13 @@ main(argc, argv)
|
||||
}
|
||||
}
|
||||
|
||||
- filelist = fileptr = (char **)malloc(argc*sizeof(char *));
|
||||
+ filelist = (char **)malloc(argc*sizeof(char *));
|
||||
+ if (filelist == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "Cannot allocate memory for file list.\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ fileptr = filelist;
|
||||
*filelist = NULL;
|
||||
|
||||
if((progname = rindex(argv[0], '/')) != 0)
|
||||
@@ -836,6 +843,7 @@ nextarg: continue;
|
||||
decompress(0, 1);
|
||||
}
|
||||
|
||||
+ free(filelist);
|
||||
exit((exit_code== -1) ? 1:exit_code);
|
||||
return 0;
|
||||
}
|
||||
@ -29,7 +29,6 @@ Patch3: ncompress-4.2.4.4-2GB.patch
|
||||
# ~> #207001
|
||||
Patch4: ncompress-4.2.4.4-endians.patch
|
||||
|
||||
Patch7: ncompress-4.2.4-uncheckedmalloc.patch
|
||||
Patch8: ncompress-4.2.4-memmove.patch
|
||||
BuildRequires: gcc glibc-devel fileutils
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -65,7 +64,6 @@ sed "s/\$(ARCH_FLAGS)/$ARCH_FLAGS/" Makefile.def > Makefile
|
||||
%patch2 -p1 -b .filenamelen
|
||||
%patch3 -p1 -b .2GB
|
||||
%patch4 -p1 -b .endians
|
||||
%patch7 -p1 -b .malloccheck
|
||||
|
||||
%build
|
||||
make CFLAGS="%{optflags} %{?nc_endian} %{?nc_align}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user