mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-24 10:23:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

copy: sanity-check --suffix

Browse Source 
* src/cp.c, src/install.c, src/ln.c, src/mv.c (main):
Use set_simple_backup_suffix, to sanity-check the user-supplied
backup suffix.
This commit is contained in:
Paul Eggert 2017-07-30 17:11:24 -07:00
parent 0d74ac470f
commit e01bb64aeb
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -21,6 +21,10 @@ GNU coreutils NEWS -*- outline -*-
now makes a numbered backup file instead of losing the data.
[the bug dates back to the initial implementation]
cp, install, ln, and mv now ignore nonsensical backup suffixes.
For example, --suffix='/' and --suffix='' are now no-ops.
[the bug dates back to the initial implementation]
date and touch no longer overwrite the heap with large
user specified TZ values (CVE-2017-7476).
[bug introduced in coreutils-8.27]

4
src/cp.c
View File

@ -930,6 +930,7 @@ main (int argc, char **argv)
int c;
bool ok;
bool make_backups = false;
char const *backup_suffix = NULL;
char *version_control_string = NULL;
struct cp_options x;
bool copy_contents = false;
@ -1126,7 +1127,7 @@ main (int argc, char **argv)
case 'S':
make_backups = true;
simple_backup_suffix = optarg;
backup_suffix = optarg;
break;
case_GETOPT_HELP_CHAR;
@ -1161,6 +1162,7 @@ main (int argc, char **argv)
? xget_version (_("backup type"),
version_control_string)
: no_backups);
set_simple_backup_suffix (backup_suffix);
if (x.dereference == DEREF_UNDEFINED)
{

4
src/install.c
View File

@ -796,6 +796,7 @@ main (int argc, char **argv)
int exit_status = EXIT_SUCCESS;
const char *specified_mode = NULL;
bool make_backups = false;
char const *backup_suffix = NULL;
char *version_control_string = NULL;
bool mkdir_and_install = false;
struct cp_options x;
@ -873,7 +874,7 @@ main (int argc, char **argv)
break;
case 'S':
make_backups = true;
simple_backup_suffix = optarg;
backup_suffix = optarg;
break;
case 't':
if (target_directory)
@ -949,6 +950,7 @@ main (int argc, char **argv)
? xget_version (_("backup type"),
version_control_string)
: no_backups);
set_simple_backup_suffix (backup_suffix);
if (x.preserve_security_context && (x.set_security_context || scontext))
die (EXIT_FAILURE, 0,

4
src/ln.c
View File

@ -438,6 +438,7 @@ main (int argc, char **argv)
int c;
bool ok;
bool make_backups = false;
char const *backup_suffix = NULL;
char *version_control_string = NULL;
char const *target_directory = NULL;
bool no_target_directory = false;
@ -515,7 +516,7 @@ main (int argc, char **argv)
break;
case 'S':
make_backups = true;
simple_backup_suffix = optarg;
backup_suffix = optarg;
break;
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@ -565,6 +566,7 @@ main (int argc, char **argv)
backup_type = (make_backups
? xget_version (_("backup type"), version_control_string)
: no_backups);
set_simple_backup_suffix (backup_suffix);
if (relative && !symbolic_link)
{

4
src/mv.c
View File

@ -336,6 +336,7 @@ main (int argc, char **argv)
int c;
bool ok;
bool make_backups = false;
char const *backup_suffix = NULL;
char *version_control_string = NULL;
struct cp_options x;
char *target_directory = NULL;
@ -405,7 +406,7 @@ main (int argc, char **argv)
break;
case 'S':
make_backups = true;
simple_backup_suffix = optarg;
backup_suffix = optarg;
break;
case 'Z':
/* As a performance enhancement, don't even bother trying
@ -469,6 +470,7 @@ main (int argc, char **argv)
? xget_version (_("backup type"),
version_control_string)
: no_backups);
set_simple_backup_suffix (backup_suffix);
hash_init ();