Merge commit '06f719fd79fe15ce6fd5431bc58fcb22851de24d^'

2 files changed, 9 insertions, 9 deletions

diff --git a/findutils/.gitignore b/findutils/.gitignore
deleted file mode 100644
index 7a30caf5c..000000000
--- a/findutils/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Config.in and Kbuild are auto-generated
-Config.in
-Kbuild
diff --git a/findutils/grep.c b/findutils/grep.c
index bf42753c5..f166aa48a 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -629,30 +629,33 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
         /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
-        int Copt;
+        int Copt, opts;
 
         /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
          * -m,-A,-B,-C have numeric param */
         opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";
-        getopt32(argv,
+        opts = getopt32(argv,
                 OPTSTR_GREP,
                 &pattern_head, &fopt, &max_matches,
                 &lines_after, &lines_before, &Copt);
 
-        if (option_mask32 & OPT_C) {
+        if (opts & OPT_C) {
                 /* -C unsets prev -A and -B, but following -A or -B
                    may override it */
-                if (!(option_mask32 & OPT_A)) /* not overridden */
+                if (!(opts & OPT_A)) /* not overridden */
                         lines_after = Copt;
-                if (!(option_mask32 & OPT_B)) /* not overridden */
+                if (!(opts & OPT_B)) /* not overridden */
                         lines_before = Copt;
         }
         /* sanity checks */
-        if (option_mask32 & (OPT_c|OPT_q|OPT_l|OPT_L)) {
+        if (opts & (OPT_c|OPT_q|OPT_l|OPT_L)) {
                 option_mask32 &= ~OPT_n;
                 lines_before = 0;
                 lines_after = 0;
         } else if (lines_before > 0) {
+                if (lines_before > INT_MAX / sizeof(long long))
+                        lines_before = INT_MAX / sizeof(long long);
+                /* overflow in (lines_before * sizeof(x)) is prevented (above) */
                 before_buf = xzalloc(lines_before * sizeof(before_buf[0]));
                 IF_EXTRA_COMPAT(before_buf_size = xzalloc(lines_before * sizeof(before_buf_size[0]));)
         }