Attachment 25916 Details for Bug 62184

[patch] patch

unarj-2.65-tree.diff (text/plain), 1.46 KB, created by Marian Jancar on 2004-11-09 22:25:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marian Jancar

Created: 2004-11-09 22:25:05 UTC

Size: 1.46 KB

patch

obsolete

>--- unarj.c
>+++ unarj.c
>@@ -84,6 +84,8 @@
> #include <console.h>
> #endif
> 
>+#include <alloca.h>
>+
> /* Global variables */
> 
> UCRC   crc;
>@@ -584,6 +586,40 @@
>     return -1;          /* could not find a valid header */
> }
> 
>+/* avoid extracting outside of current directory */
>+static void sanitize_filename(char *sane, char *insane, size_t len)
>+{
>+	char broken[] = "broken_filename";
>+	char *tmp, *next, *cur, *_sane = sane;
>+	
>+	tmp = alloca(len + sizeof(broken));
>+	cur = NULL;
>+
>+	strncpy(tmp, insane, len);
>+	tmp[len] = '\0';
>+	sane[0] = '\0';
>+	
>+	for(next = strtok(tmp, "/"); next; next = strtok(NULL, "/")) {
>+		if(cur) {
>+			strcpy(sane, cur);
>+			sane += strlen(cur);
>+			strcpy(sane, "/");
>+			sane++;
>+		}
>+		if(!strcmp(".", next) || !strcmp("..", next))
>+			cur = NULL;
>+		else 
>+			cur = next;
>+	}
>+	
>+	if(cur)
>+		strcpy(sane, cur);
>+	else
>+		strcpy(sane, broken);
>+	
>+	entry_pos = sane - _sane;
>+}
>+
> static int
> read_header(first, fd, name)
> int  first;
>@@ -634,7 +670,15 @@
>         error(M_HEADRCRC, "");
> 
>     hdr_filename = (char *)&header[first_hdr_size];
>-    strncopy(filename, hdr_filename, sizeof(filename));
>+    switch(file_type) {
>+    case 0: /* binary */
>+    case 1: /* text */
>+    case 3: /* directory */
>+	sanitize_filename(filename, hdr_filename, sizeof(filename));
>+	break;
>+    default:
>+	strncopy(filename, hdr_filename, sizeof(filename));
>+    }
>     if (host_os != OS)
>         strparity((uchar *)filename);
>     if ((arj_flags & PATHSYM_FLAG) != 0)

Actions: View | Diff

Attachments on bug 62184: 24933 | 25750 | 25912 | 25913 | 25914 | 25916 | 26306 | 26307