pstodulk pushed to unzip (pstodulk_segment). "fixed segmentation fault"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Mar 29 13:44:07 UTC 2015
>From f3d535e69f12ebc81c62126ecfeb4f6f0686a9c5 Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk at redhat.com>
Date: Sun, 29 Mar 2015 15:43:31 +0200
Subject: fixed segmentation fault
diff --git a/unzip-sgmnt-rfe.patch b/unzip-sgmnt-rfe.patch
index 8dbfdc7..532fd0e 100644
--- a/unzip-sgmnt-rfe.patch
+++ b/unzip-sgmnt-rfe.patch
@@ -1,5 +1,5 @@
diff --git a/cmsmvs/vmmvs.c b/cmsmvs/vmmvs.c
-index 8416ce8..13d410d 100644
+index 8416ce8..f5bf356 100644
--- a/cmsmvs/vmmvs.c
+++ b/cmsmvs/vmmvs.c
@@ -35,17 +35,23 @@
@@ -7,7 +7,7 @@ index 8416ce8..13d410d 100644
/********************************/
-FILE *vmmvs_open_infile(__G)
-+FILE *vmmvs_open_infile(__G fn)
++FILE *vmmvs_open_infile(__G__ fn)
__GDEF
+ char *fn;
{
@@ -80,7 +80,7 @@ index 5dfc0a0..dee57b1 100644
ZCONST char Far ExclFilenameNotMatched[] =
"caution: excluded filename not matched: %s\n";
diff --git a/extract.c b/extract.c
-index 7134bfe..e41803f 100644
+index 7134bfe..37850a7 100644
--- a/extract.c
+++ b/extract.c
@@ -19,6 +19,7 @@
@@ -198,8 +198,26 @@ index 7134bfe..e41803f 100644
inbuf_offset = request % INBUFSIZ;
bufstart = request - inbuf_offset;
+@@ -1072,7 +1137,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ (long)bufstart, (long)G.cur_zipfile_bufstart));
+ if (request < 0) {
+ Info(slide, 0x401, ((char *)slide, LoadFarStringSmall(SeekMsg),
+- G.zipfn, LoadFarString(ReportMsg)));
++ G.zipfn, 1, LoadFarString(ReportMsg)));
+ error_in_archive = PK_ERR;
+ if (*pfilnum == 1 && G.extra_bytes != 0L) {
+ Info(slide, 0x401, ((char *)slide,
+@@ -1093,7 +1158,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ "debug: recompensated request still < 0\n"));
+ Info(slide, 0x401, ((char *)slide,
+ LoadFarStringSmall(SeekMsg),
+- G.zipfn, LoadFarString(ReportMsg)));
++ G.zipfn, 2,LoadFarString(ReportMsg)));
+ error_in_archive = PK_BADERR;
+ continue;
+ }
diff --git a/fileio.c b/fileio.c
-index 2a61a30..8bbe1b9 100644
+index 2a61a30..5a47b0a 100644
--- a/fileio.c
+++ b/fileio.c
@@ -147,6 +147,10 @@ static int disk_error OF((__GPRO));
@@ -566,7 +584,7 @@ index 2a61a30..8bbe1b9 100644
+ if (request < 0)
+ {
+ Info(slide, 1, ((char *)slide, LoadFarStringSmall(SeekMsg),
-+ 2, G.zipfn, LoadFarString(ReportMsg)));
++ G.zipfn, 11, LoadFarString(ReportMsg)));
+ return PK_BADERR;
+ }
+#endif /* 0 */ /* Pre-segment-support. */
@@ -585,7 +603,7 @@ index 2a61a30..8bbe1b9 100644
- "fpos_zip: abs_offset = %s, G.extra_bytes = %s\n",
- FmZofft(abs_offset, NULL, NULL),
- FmZofft(G.extra_bytes, NULL, NULL)));
-+ 3, G.zipfn, LoadFarString(ReportMsg)));
++ G.zipfn, 12, LoadFarString(ReportMsg)));
+ return PK_BADERR;
+ }
+ /* Get the new segment size, and calculate the new offset.
@@ -639,7 +657,7 @@ index 2a61a30..8bbe1b9 100644
+ if (open_infile_sgmnt( __G__ (tmp_disk- G.sgmnt_nr)))
+ {
+ Info(slide, 1, ((char *)slide, LoadFarStringSmall(SeekMsg),
-+ 4, G.zipfn, LoadFarString(ReportMsg)));
++ G.zipfn, 13, LoadFarString(ReportMsg)));
+ return PK_BADERR;
+ }
+ }
@@ -1078,49 +1096,6 @@ index ab32270..783f261 100644
$(STRIP) $(UNZIPS)
# AT&T 6300+, System V.2 Unix: run-time out-of-memory error if don't use -Ml;
-diff --git a/unix/configure b/unix/configure
-index 3c2d353..f981836 100755
---- a/unix/configure
-+++ b/unix/configure
-@@ -70,7 +70,7 @@ int main()
- _EOF_
- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
- if test $? -eq 0; then
-- CFLAGS_OPT='-O3'
-+ CFLAGS_OPT='-O0'
- echo " DEC C ($CFLAGS_OPT)"
- else
- # HP-UX HP C?
-@@ -111,7 +111,7 @@ int main()
- _EOF_
- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
- if test $? -eq 0; then
-- CFLAGS_OPT='-O3'
-+ CFLAGS_OPT='-O0'
- echo " GNU C ($CFLAGS_OPT)"
- # Special Mac OS X shared library "ld" option?
- if test ` uname -s 2> /dev/null ` = 'Darwin'; then
-@@ -123,7 +123,7 @@ _EOF_
- rm -f conftest
- fi
- else
-- CFLAGS_OPT='-O'
-+ CFLAGS_OPT='-O0'
- echo " Other-unknown C ($CFLAGS_OPT)"
- fi
- fi
-@@ -662,8 +662,8 @@ _EOF_
- fi
-
-
--echo CC=\"${CC}\" CF=\"${CFLAGSR} ${D_USE_BZ2}\" CRCA_O=\"${CRC32OA}\" \
-- AS=\"${CC} -c\" LFLAGS1=\"${LFLAGS1}\" LF2=\"${LFLAGS2}\" \
-- CC_BZ=\"${CC_BZ}\" CFLAGS_BZ=\"${CFLAGS_BZ}\" \
-+echo CC=\"${CC}\" CF=\"${CFLAGSR} ${D_USE_BZ2} -ggdb3 -O0\" CRCA_O=\"${CRC32OA}\" \
-+ AS=\"${CC} -c\" LFLAGS1=\"${LFLAGS1} -ggdb3 -O0 \" LF2=\"${LFLAGS2} -ggdb3 -O0 \" \
-+ CC_BZ=\"${CC_BZ}\" CFLAGS_BZ=\"${CFLAGS_BZ} -ggdb3 -O0 \" \
- IZ_BZIP2=\"${IZ_BZIP2}\" D_USE_BZ2=\"${D_USE_BZ2}\" \
- L_BZ2=\"${L_BZ2}\" LIBBZ2=\"${LIBBZ2}\" > flags
diff --git a/unzpriv.h b/unzpriv.h
index 5c83a6e..22ef1eb 100644
--- a/unzpriv.h
diff --git a/unzip.spec b/unzip.spec
index 2c5f2aa..7c8abf5 100644
--- a/unzip.spec
+++ b/unzip.spec
@@ -1,7 +1,7 @@
Summary: A utility for unpacking zip files
Name: unzip
Version: 6.0
-Release: 22%{?dist}
+Release: 24%{?dist}
License: BSD
Group: Applications/Archiving
Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz
@@ -89,7 +89,10 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{
%{_mandir}/*/*
%changelog
-* Wed Mar 25 2015 Petr Stodulka <pstodulk at redhat.com> - 6.0-22
+* Sun Mar 29 2015 Petr Stodulka <pstodulk at redhat.com> - 6.0-24
+- fix segmentation fault
+
+* Wed Mar 25 2015 Petr Stodulka <pstodulk at redhat.com> - 6.0-23
- applied alpha patch for support of segmented archives
* Sat Feb 21 2015 Till Maas <opensource at till.name> - 6.0-21
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/unzip.git/commit/?h=pstodulk_segment&id=f3d535e69f12ebc81c62126ecfeb4f6f0686a9c5
More information about the scm-commits
mailing list