2 files changed, 45 insertions, 4 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 53d8239c7..5d5e24bfb 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -1291,9 +1291,27 @@ int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int find_main(int argc UNUSED_PARAM, char **argv)
 {
         int i, firstopt, status = EXIT_SUCCESS;
+        char **past_HLP, *saved;
 
         INIT_G();
 
+        /* "find -type f" + getopt("+HLP") => disaster.
+         * Need to avoid getopt running into a non-HLP option.
+         * Do this by temporarily storing NULL there:
+         */
+        past_HLP = argv;
+        for (;;) {
+                saved = *++past_HLP;
+                if (!saved)
+                        break;
+                if (saved[0] != '-')
+                        break;
+                if (!saved[1])
+                        break; /* it is "-" */
+                if ((saved+1)[strspn(saved+1, "HLP")] != '\0')
+                        break;
+        }
+        *past_HLP = NULL;
         /* "+": stop on first non-option */
         i = getopt32(argv, "+HLP");
         if (i & (1<<0))
@@ -1301,7 +1319,8 @@ int find_main(int argc UNUSED_PARAM, char **argv)
         if (i & (1<<1))
                 G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
         /* -P is default and is ignored */
-        argv += optind;
+        argv = past_HLP; /* same result as "argv += optind;" */
+        *past_HLP = saved;
 
         for (firstopt = 0; argv[firstopt]; firstopt++) {
                 if (argv[firstopt][0] == '-')
diff --git a/findutils/grep.c b/findutils/grep.c
index 5bbe61100..f5f95cb95 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -381,6 +381,9 @@ static int grep_file(FILE *file)
  opt_f_not_found: ;
                                 }
                         } else {
+#if ENABLE_EXTRA_COMPAT
+                                unsigned start_pos;
+#endif
                                 char *match_at;
 
                                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
@@ -397,15 +400,18 @@ static int grep_file(FILE *file)
 #if !ENABLE_EXTRA_COMPAT
                                 gl->matched_range.rm_so = 0;
                                 gl->matched_range.rm_eo = 0;
+#else
+                                start_pos = 0;
 #endif
                                 match_at = line;
  opt_w_again:
+//bb_error_msg("'%s' start_pos:%d line_len:%d", match_at, start_pos, line_len);
                                 if (
 #if !ENABLE_EXTRA_COMPAT
                                         regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0
 #else
                                         re_search(&gl->compiled_regex, match_at, line_len,
-                                                        /*start:*/ 0, /*range:*/ line_len,
+                                                        start_pos, /*range:*/ line_len,
                                                         &gl->matched_range) >= 0
 #endif
                                 ) {
@@ -424,8 +430,24 @@ static int grep_file(FILE *file)
                                                         if (!c || (!isalnum(c) && c != '_')) {
                                                                 found = 1;
                                                         } else {
-                                                                match_at += gl->matched_range.rm_eo;
-                                                                goto opt_w_again;
+                        /*
+                         * Why check gl->matched_range.rm_eo?
+                         * Zero-length match makes -w skip the line:
+                         * "echo foo | grep ^" prints "foo",
+                         * "echo foo | grep -w ^" prints nothing.
+                         * Without such check, we can loop forever.
+                         */
+#if !ENABLE_EXTRA_COMPAT
+                                                                if (gl->matched_range.rm_eo != 0) {
+                                                                        match_at += gl->matched_range.rm_eo;
+                                                                        goto opt_w_again;
+                                                                }
+#else
+                                                                if (gl->matched_range.rm_eo > start_pos) {
+                                                                        start_pos = gl->matched_range.rm_eo;
+                                                                        goto opt_w_again;
+                                                                }
+#endif
                                                         }
                                                 }
                                         }