]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 8.1.0436: can get the text of inputsecret() with getcmdline() v8.1.0436
authorBram Moolenaar <Bram@vim.org>
Tue, 25 Sep 2018 20:27:35 +0000 (22:27 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 25 Sep 2018 20:27:35 +0000 (22:27 +0200)
Problem:    Can get the text of inputsecret() with getcmdline(). (Tommy Allen)
Solution:   Don't return the text.

src/ex_getln.c
src/version.c

index f08ae903261008f82fd188e9e39754d71aaa8cf3..02c3e3009544d0b6d31ad20bd6dfd658dacf14f7 100644 (file)
@@ -1310,7 +1310,7 @@ getcmdline(
            if (c != Ctrl_N && c != Ctrl_G && (c != 'e'
                                    || (ccline.cmdfirstc == '=' && KeyTyped)
 #ifdef FEAT_EVAL
-                                   || cmdline_star
+                                   || cmdline_star > 0
 #endif
                                    ))
            {
@@ -1805,8 +1805,8 @@ getcmdline(
                new_cmdpos = -1;
                if (c == '=')
                {
-                   if (ccline.cmdfirstc == '=' // can't do this recursively
-                           || cmdline_star)    // or when typing a password
+                   if (ccline.cmdfirstc == '='  // can't do this recursively
+                           || cmdline_star > 0) // or when typing a password
                    {
                        beep_flush();
                        c = ESC;
@@ -6506,8 +6506,11 @@ get_ccline_ptr(void)
     char_u *
 get_cmdline_str(void)
 {
-    struct cmdline_info *p = get_ccline_ptr();
+    struct cmdline_info *p;
 
+    if (cmdline_star > 0)
+       return NULL;
+    p = get_ccline_ptr();
     if (p == NULL)
        return NULL;
     return vim_strnsave(p->cmdbuff, p->cmdlen);
index d3b09ea4bf8cf8500313ccd449cdc0dab0ed35ae..7f21f2d8099e91ed7b6cd4e9ba6b5f2f4661095e 100644 (file)
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/