From: Colin Percival <cperciva@daemonology.net>
Date: Tue, 16 Aug 2011 05:32:31 +0000 (-0400)
Subject: Squawk if we read '-C' '' from consecutive lines.
X-Git-Tag: v3.0.0a~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cd32bf17ea3efc77cb4d4e089c369936604345;p=thirdparty%2Flibarchive.git

Squawk if we read '-C' '' from consecutive lines.

Via:	Tarsnap

SVN-Revision: 3623
---

diff --git a/tar/write.c b/tar/write.c
index ff23e768a..012132b29 100644
--- a/tar/write.c
+++ b/tar/write.c
@@ -530,7 +530,13 @@ archive_names_from_file(struct bsdtar *bsdtar, struct archive *a)
 	lr = lafe_line_reader(bsdtar->names_from_file, bsdtar->option_null);
 	while ((line = lafe_line_reader_next(lr)) != NULL) {
 		if (bsdtar->next_line_is_dir) {
-			set_chdir(bsdtar, line);
+			if (*line != '\0')
+				set_chdir(bsdtar, line);
+			else {
+				lafe_warnc(0,
+				    "Meaningless argument for -C: ''");
+				bsdtar->return_value = 1;
+			}
 			bsdtar->next_line_is_dir = 0;
 		} else if (!bsdtar->option_null && strcmp(line, "-C") == 0)
 			bsdtar->next_line_is_dir = 1;