summaryrefslogtreecommitdiff
path: root/archivers/zoo
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2005-11-12 13:09:06 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2005-11-12 13:09:06 +0000
commit873d90098cdc6d2aa32555e9abab93ddfc1ced8b (patch)
treec78562f8f6996aa45b7454f6e658cb9844d5083a /archivers/zoo
parentIron Bars Shell is a restricted Unix shell. The user can not step out of, nor (diff)
Fix a bug that causes it to loop on some ill-formed archives.
Submitted by: Derek M Jones <derek@knosof.co.uk>
Notes
Notes: svn path=/head/; revision=148031
Diffstat (limited to 'archivers/zoo')
-rw-r--r--archivers/zoo/Makefile1
-rw-r--r--archivers/zoo/files/patch-zooext.c12
2 files changed, 13 insertions, 0 deletions
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 55ecfa98dea1..49a579521ca9 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zoo
PORTVERSION= 2.10.1
+PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
DISTNAME= zoo-2.10pl1
diff --git a/archivers/zoo/files/patch-zooext.c b/archivers/zoo/files/patch-zooext.c
new file mode 100644
index 000000000000..51217b8b6669
--- /dev/null
+++ b/archivers/zoo/files/patch-zooext.c
@@ -0,0 +1,12 @@
+--- zooext.c~ Sat May 1 05:58:50 1993
++++ zooext.c Sat Nov 12 14:04:17 2005
+@@ -184,7 +184,8 @@
+ this_file = STDOUT; /* standard output */
+
+ while (1) {
+- frd_dir (&direntry, zoo_file);
++ if (frd_dir (&direntry, zoo_file) < 0)
++ prterror('f', bad_directory);
+ if (direntry.zoo_tag != ZOO_TAG) {
+ long currpos, zoolength;
+ prterror ('F', invalid_header);