From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 7 Nov 2010 03:09:38 +0000 (+0000)
Subject: split: fail immediately if impossible to create a large file
X-Git-Tag: v8.8~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad13ad14ac50b7b7fe57ff3265494b38e15281c;p=thirdparty%2Fcoreutils.git

split: fail immediately if impossible to create a large file

* src/split.c (main): Error if -[bC] value > OFF_T_MAX
* tests/misc/split-fail: Adjust for the new lower limits
---

diff --git a/src/split.c b/src/split.c
index 61ae265d83..a391ecc127 100644
--- a/src/split.c
+++ b/src/split.c
@@ -432,6 +432,13 @@ main (int argc, char **argv)
               error (0, 0, _("%s: invalid number of bytes"), optarg);
               usage (EXIT_FAILURE);
             }
+          /* If input is a pipe, we could get more data than is possible
+             to write to a single file, so indicate that immediately
+             rather than having possibly future invocations fail.  */
+          if (OFF_T_MAX < n_units)
+            error (EXIT_FAILURE, EFBIG,
+                   _("%s: invalid number of bytes"), optarg);
+
           break;
 
         case 'l':
@@ -456,6 +463,9 @@ main (int argc, char **argv)
               error (0, 0, _("%s: invalid number of bytes"), optarg);
               usage (EXIT_FAILURE);
             }
+          if (OFF_T_MAX < n_units)
+            error (EXIT_FAILURE, EFBIG,
+                   _("%s: invalid number of bytes"), optarg);
           break;
 
         case '0':
diff --git a/tests/misc/split-fail b/tests/misc/split-fail
index 68c9d73340..0ce6f57340 100755
--- a/tests/misc/split-fail
+++ b/tests/misc/split-fail
@@ -45,7 +45,8 @@ split -1 in 2> /dev/null || fail=1
 split -0 in 2> /dev/null && fail=1
 
 split --lines=$UINTMAX_MAX in || fail=1
-split --bytes=$UINTMAX_MAX in || fail=1
+split --bytes=$OFF_T_MAX in || fail=1
+split --line-bytes=$OFF_T_OFLOW 2> /dev/null in && fail=1
 split --line-bytes=$SIZE_OFLOW 2> /dev/null in && fail=1
 
 # Make sure that a huge obsolete option evokes the right failure.