updated for version 7.3.039

Problem:    Crash when using skk.vim plugin.
Solution:   Get length of expression evaluation result only after checking for
            NULL.  (Noriaki Yagi, Dominique Pelle)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 6fa5531d01629e1cbf7f3e1afc679d660f7a4312..c3514874f73baef1d3b0a9827b76fb654df13080 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -688,24 +688,27 @@ getcmdline(firstc, count, indent)
                    p = get_expr_line();
                    --textlock;
                    restore_cmdline(&save_ccline);
-                   len = (int)STRLEN(p);
 
-                   if (p != NULL && realloc_cmdbuff(len + 1) == OK)
+                   if (p != NULL)
                    {
-                       ccline.cmdlen = len;
-                       STRCPY(ccline.cmdbuff, p);
-                       vim_free(p);
-
-                       /* Restore the cursor or use the position set with
-                        * set_cmdline_pos(). */
-                       if (new_cmdpos > ccline.cmdlen)
-                           ccline.cmdpos = ccline.cmdlen;
-                       else
-                           ccline.cmdpos = new_cmdpos;
-
-                       KeyTyped = FALSE;       /* Don't do p_wc completion. */
-                       redrawcmd();
-                       goto cmdline_changed;
+                       len = (int)STRLEN(p);
+                       if (realloc_cmdbuff(len + 1) == OK)
+                       {
+                           ccline.cmdlen = len;
+                           STRCPY(ccline.cmdbuff, p);
+                           vim_free(p);
+
+                           /* Restore the cursor or use the position set with
+                            * set_cmdline_pos(). */
+                           if (new_cmdpos > ccline.cmdlen)
+                               ccline.cmdpos = ccline.cmdlen;
+                           else
+                               ccline.cmdpos = new_cmdpos;
+
+                           KeyTyped = FALSE;   /* Don't do p_wc completion. */
+                           redrawcmd();
+                           goto cmdline_changed;
+                       }
                    }
                }
                beep_flush();

diff --git a/src/version.c b/src/version.c
index d4244e1c02d46c3cac4b4dbac3a6e32025b0bd52..b334cdb1605389dd795a19da04330eb94ceaebf4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    39,
 /**/
     38,
 /**/