commit a1d5c154dbd5fbe317726bbf2ba99632b91878f4
author Bram Moolenaar <Bram@vim.org> Sat Dec 16 19:05:22 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Dec 16 19:05:22 2017 +0100
tree 62365cb866b7f1a547ae1581d18126815119dcc0
parent 200d0e36bc5384beb9dc76ac75806ac0aecf84ac

patch 8.0.1396: memory leak when CTRL-G in search command line fails

Problem:    Memory leak when CTRL-G in search command line fails.
Solution:   Move restore_last_search_pattern to after "if".

src/ex_getln.c

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 7c553e4..405e1f6 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1810,11 +1810,11 @@
 # endif
 			old_botline = curwin->w_botline;
 			update_screen(NOT_VALID);
-			restore_last_search_pattern();
 			redrawcmdline();
 		    }
 		    else
 			vim_beep(BO_ERROR);
+		    restore_last_search_pattern();
 		    goto cmdline_not_changed;
 		}
 		break;

src/version.c

diff --git a/src/version.c b/src/version.c
index 0b17338..224118a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1396,
+/**/
     1395,
 /**/
     1394,