diff --git a/src/ex_getln.c b/src/ex_getln.c
index 09f2842..7f02b88 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4130,7 +4130,7 @@
 	return NULL;
 
     p = get_ccline_ptr();
-    if (p && p->xpc != NULL)
+    if (p != NULL && p->xpc != NULL)
     {
 	char_u *cmd_compl;
 
@@ -4138,7 +4138,7 @@
 
 	cmd_compl = cmdcomplete_type_to_str(p->xpc->xp_context);
 	if (cmd_compl != NULL)
-	    return vim_strnsave(cmd_compl, strlen((char *)cmd_compl));
+	    return vim_strsave(cmd_compl);
     }
 
     return NULL;
diff --git a/src/version.c b/src/version.c
index 79e89aa..4a4c7a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4910,
+/**/
     4909,
 /**/
     4908,