Make sure that the argument to --strip-components is a number. Otherwise

if someone accidentally omits the argument, we'll silently eat the next
command line argument.  (GNU tar checks this, otherwise I wouldn't bother.)

Suggested by:	Ralph Corderoy (via Tarsnap)

SVN-Revision: 3513

diff --git a/tar/bsdtar.c b/tar/bsdtar.c
index d69ffb3456513344b155064456faa759b2fa135a..d508e775235fc5b6a1fe76ea03f9f4773b77b36d 100644 (file)
--- a/tar/bsdtar.c
+++ b/tar/bsdtar.c
@@ -493,7 +493,13 @@ main(int argc, char **argv)
                        bsdtar->extract_flags |= ARCHIVE_EXTRACT_OWNER;
                        break;
                case OPTION_STRIP_COMPONENTS: /* GNU tar 1.15 */
-                       bsdtar->strip_components = atoi(bsdtar->argument);
+                       errno = 0;
+                       bsdtar->strip_components = strtol(bsdtar->argument,
+                           NULL, 0);
+                       if (errno)
+                               lafe_errc(1, 0,
+                                   "Invalid --strip-components argument: %s",
+                                   bsdtar->argument);
                        break;
                case 'T': /* GNU tar */
                        bsdtar->names_from_file = bsdtar->argument;