summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@Penguin.CS.UCLA.EDU>2016-10-29 21:04:40 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-10-29 21:05:35 -0700
commit7340f67b9860ea0531c1450e5aa261c50f67165d (patch)
tree038eb482cfd66e60b1e4051aa56446a97ae26926
parent1d2674bacc23cb26ccd432fde55f306ec900271a (diff)
downloadtar-7340f67b9860ea0531c1450e5aa261c50f67165d.tar.gz
When extracting, skip ".." members
* NEWS: Document this. * src/extract.c (extract_archive): Skip members whose names contain "..".
-rw-r--r--NEWS8
-rw-r--r--src/extract.c8
2 files changed, 15 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index caa77bc1..07daaa76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,15 @@
-GNU tar NEWS - User visible changes. 2016-05-27
+GNU tar NEWS - User visible changes. 2016-10-29
Please send GNU tar bug reports to <bug-tar@gnu.org>
version 1.29.90 (Git)
+* Member names containing '..' components are now skipped when extracting.
+
+This fixes tar's behavior to match its documentation, and is a bit
+safer when extracting untrusted archives over old files (an unsafe
+practice that the tar manual has long recommended against).
+
* Report erroneous use of positional options.
During archive creation or update, tar keeps track of positional
diff --git a/src/extract.c b/src/extract.c
index f982433d..7904148f 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1629,12 +1629,20 @@ extract_archive (void)
{
char typeflag;
tar_extractor_t fun;
+ bool skip_dotdot_name;
fatal_exit_hook = extract_finish;
set_next_block_after (current_header);
+ skip_dotdot_name = (!absolute_names_option
+ && contains_dot_dot (current_stat_info.orig_file_name));
+ if (skip_dotdot_name)
+ ERROR ((0, 0, _("%s: Member name contains '..'"),
+ quotearg_colon (current_stat_info.orig_file_name)));
+
if (!current_stat_info.file_name[0]
+ || skip_dotdot_name
|| (interactive_option
&& !confirm ("extract", current_stat_info.file_name)))
{