--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1378,6 +1378,7 @@ getcmdline_int(
 			    redrawcmd();
 			    goto cmdline_changed;
 			}
+			vim_free(p);
 		    }
 		}
 		beep_flush();

--- a/src/move.c
+++ b/src/move.c
@@ -1961,7 +1961,7 @@ scroll_cursor_bot(int min_scroll, int se
 	    scrolled += loff.height;
 	    if (loff.lnum == curwin->w_botline
 #ifdef FEAT_DIFF
-			    && boff.fill == 0
+			    && loff.fill == 0
 #endif
 		    )
 		scrolled -= curwin->w_empty_rows;

--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    543,
+/**/
     542,
 /**/
     541,