3 files changed, 18 insertions, 7 deletions

diff --git a/editors/diff.c b/editors/diff.c
index a78a0ee28..c3ad31bf3 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -740,9 +740,10 @@ static int diffreg(char *file[2])
                         unlink(name);
                         if (bb_copyfd_eof(fd, fd_tmp) < 0)
                                 xfunc_die();
-                        if (fd) /* Prevents closing of stdin */
+                        if (fd != STDIN_FILENO)
                                 close(fd);
                         fd = fd_tmp;
+                        xlseek(fd, 0, SEEK_SET);
                 }
                 fp[i] = fdopen(fd, "r");
         }
diff --git a/editors/patch.c b/editors/patch.c
index 13785ef46..cb25e4140 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -345,6 +345,8 @@ done:
 // state 1: Found +++ file indicator, look for @@
 // state 2: In hunk: counting initial context lines
 // state 3: In hunk: getting body
+// Like GNU patch, we don't require a --- line before the +++, and
+// also allow the --- after the +++ line.
 
 int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int patch_main(int argc UNUSED_PARAM, char **argv)
@@ -412,7 +414,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 // Open a new file?
-                if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
+                if (is_prefixed_with(patchline, "--- ") || is_prefixed_with(patchline, "+++ ")) {
                         char *s, **name = reverse ? &newname : &oldname;
                         int i;
 
@@ -444,7 +446,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                 // Start a new hunk?  Usually @@ -oldline,oldlen +newline,newlen @@
                 // but a missing ,value means the value is 1.
-                } else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
+                } else if (state == 1 && is_prefixed_with(patchline, "@@ -")) {
                         int i;
                         char *s = patchline+4;
 
@@ -462,6 +464,14 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         TT.context = 0;
                         state = 2;
 
+                        // If the --- line is missing or malformed, either oldname
+                        // or (for -R) newname could be NULL -- but not both.  Like
+                        // GNU patch, proceed based on the +++ line, and avoid SEGVs.
+                        if (!oldname)
+                                oldname = xstrdup("MISSING_FILENAME");
+                        if (!newname)
+                                newname = xstrdup("MISSING_FILENAME");
+
                         // If this is the first hunk, open the file.
                         if (TT.filein == -1) {
                                 int oldsum, newsum, empty = 0;
diff --git a/editors/vi.c b/editors/vi.c
index 1fa97b568..926aef19b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2017,8 +2017,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                         p--;
                 }
         } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS
-                //     123456789
-                if ((p[-1] != '\n') && (dot>text)) {
+                if (p > text) {
                         p--;
                         p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED);  // shrink buffer 1 char
                 }
@@ -4073,8 +4072,9 @@ static void do_cmd(int c)
                 undo_queue_commit();
                 break;
         case KEYCODE_DELETE:
-                c = 'x';
-                // fall through
+                if (dot < end - 1)
+                        dot = yank_delete(dot, dot, 1, YANKDEL, ALLOW_UNDO);
+                break;
         case 'X':                       // X- delete char before dot
         case 'x':                       // x- delete the current char
         case 's':                       // s- substitute the current char