From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 21 Jun 2008 10:55:14 +0000 (-0400)
Subject: Security failures are ARCHIVE_FAILED (cannot continue with this
X-Git-Tag: v2.6.0~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=114420d46bf81cdec567097c46ddd4bd2c37ef55;p=thirdparty%2Flibarchive.git

Security failures are ARCHIVE_FAILED (cannot continue with this
operation), not ARCHIVE_WARN.

SVN-Revision: 135
---

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 53e2f4416..53c62a6c8 100644
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -1351,7 +1351,7 @@ cleanup_pathname(struct archive_write_disk *a)
 	if (*src == '\0') {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Invalid empty pathname");
-		return (ARCHIVE_WARN);
+		return (ARCHIVE_FAILED);
 	}
 
 	/* Skip leading '/'. */
@@ -1382,7 +1382,7 @@ cleanup_pathname(struct archive_write_disk *a)
 						archive_set_error(&a->archive,
 						    ARCHIVE_ERRNO_MISC,
 						    "Path contains '..'");
-						return (ARCHIVE_WARN);
+						return (ARCHIVE_FAILED);
 					}
 					lastdotdot = 1;
 				} else
@@ -1421,7 +1421,7 @@ cleanup_pathname(struct archive_write_disk *a)
 		archive_set_error(&a->archive,
 		    ARCHIVE_ERRNO_MISC,
 		    "Path contains trailing '..'");
-		return (ARCHIVE_WARN);
+		return (ARCHIVE_FAILED);
 	}
 	if (dest == a->name) {
 		/*