summaryrefslogtreecommitdiff
path: root/archivers/unarj/files/patch-00-over-unarj.c
diff options
context:
space:
mode:
authorAlex Kozlov <ak@FreeBSD.org>2016-02-09 22:46:58 +0000
committerAlex Kozlov <ak@FreeBSD.org>2016-02-09 22:46:58 +0000
commit667ae541342d47635fbe7b6069c3832a4def753d (patch)
tree737153b7c93b4588e86f97fc06805f416f53beda /archivers/unarj/files/patch-00-over-unarj.c
parentFix when using rrdtool 1.5+ (diff)
- Update port description
- Tidy up patches
Notes
Notes: svn path=/head/; revision=408602
Diffstat (limited to 'archivers/unarj/files/patch-00-over-unarj.c')
-rw-r--r--archivers/unarj/files/patch-00-over-unarj.c47
1 files changed, 0 insertions, 47 deletions
diff --git a/archivers/unarj/files/patch-00-over-unarj.c b/archivers/unarj/files/patch-00-over-unarj.c
deleted file mode 100644
index 3a9426f21932..000000000000
--- a/archivers/unarj/files/patch-00-over-unarj.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- unarj-2.65.orig/unarj.c
-+++ unarj.c
-@@ -217,7 +217,7 @@ static uchar arj_flags;
- static short method;
- static uint file_mode;
- static ulong time_stamp;
--static short entry_pos;
-+static ushort entry_pos;
- static ushort host_data;
- static uchar *get_ptr;
- static UCRC file_crc;
-@@ -608,6 +608,7 @@ char *name;
- error(M_BADHEADR, "");
-
- crc = CRC_MASK;
-+ memset(header, 0, sizeof(header));
- fread_crc(header, (int) headersize, fd);
- header_crc = fget_crc(fd);
- if ((crc ^ CRC_MASK) != header_crc)
-@@ -632,9 +633,13 @@ char *name;
-
- if (origsize < 0 || compsize < 0)
- error(M_HEADRCRC, "");
-+ if(first_hdr_size > headersize-2) /* need two \0 for file and comment */
-+ error(M_BADHEADR, "");
-
- hdr_filename = (char *)&header[first_hdr_size];
- strncopy(filename, hdr_filename, sizeof(filename));
-+ if(entry_pos >= strlen(filename))
-+ error(M_BADHEADR, "");
- if (host_os != OS)
- strparity((uchar *)filename);
- if ((arj_flags & PATHSYM_FLAG) != 0)
-@@ -733,11 +738,11 @@ extract()
-
- no_output = 0;
- if (command == 'E')
-- strcpy(name, &filename[entry_pos]);
-+ strncopy(name, &filename[entry_pos], sizeof(name));
- else
- {
- strcpy(name, DEFAULT_DIR);
-- strcat(name, filename);
-+ strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
- }
-
- if (host_os != OS)