7.1.020

   1 To: vim-dev@vim.org
   2 Subject: patch 7.1.020
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.1.020
  11 Problem:    Reading from uninitialized memory when using a dialog. (Dominique
  12             Pelle)
  13 Solution:   In msg_show_console_dialog() append a NUL after every appended
  14             character.
  15 Files:      src/message.c
  16
  17
  18 *** ../vim-7.1.019/src/message.c        Thu May 10 18:49:39 2007
  19 --- src/message.c       Sun Jul  1 12:06:52 2007
  20 ***************
  21 *** 3456,3466 ****
  22                     /* advance to next hotkey and set default hotkey */
  23   #ifdef FEAT_MBYTE
  24                     if (has_mbyte)
  25 !                       hotkp += (*mb_ptr2len)(hotkp);
  26                     else
  27   #endif
  28                         ++hotkp;
  29 !                   (void)copy_char(r + 1, hotkp, TRUE);
  30                     if (dfltbutton)
  31                         --dfltbutton;
  32
  33 --- 3456,3466 ----
  34                     /* advance to next hotkey and set default hotkey */
  35   #ifdef FEAT_MBYTE
  36                     if (has_mbyte)
  37 !                       hotkp += STRLEN(hotkp);
  38                     else
  39   #endif
  40                         ++hotkp;
  41 !                   hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL;
  42                     if (dfltbutton)
  43                         --dfltbutton;
  44
  45 ***************
  46 *** 3493,3499 ****
  47                         *msgp++ = (dfltbutton == 1) ? ']' : ')';
  48
  49                         /* redefine hotkey */
  50 !                       (void)copy_char(r, hotkp, TRUE);
  51                     }
  52                 }
  53                 else
  54 --- 3493,3499 ----
  55                         *msgp++ = (dfltbutton == 1) ? ']' : ')';
  56
  57                         /* redefine hotkey */
  58 !                       hotkp[copy_char(r, hotkp, TRUE)] = NUL;
  59                     }
  60                 }
  61                 else
  62 ***************
  63 *** 3519,3526 ****
  64             *msgp++ = ':';
  65             *msgp++ = ' ';
  66             *msgp = NUL;
  67 -           mb_ptr_adv(hotkp);
  68 -           *hotkp = NUL;
  69         }
  70         else
  71         {
  72 --- 3519,3524 ----
  73 ***************
  74 *** 3555,3562 ****
  75             msgp = confirm_msg + 1 + STRLEN(message);
  76             hotkp = hotk;
  77
  78 !           /* define first default hotkey */
  79 !           (void)copy_char(buttons, hotkp, TRUE);
  80
  81             /* Remember where the choices start, displaying starts here when
  82              * "hotkp" typed at the more prompt. */
  83 --- 3553,3561 ----
  84             msgp = confirm_msg + 1 + STRLEN(message);
  85             hotkp = hotk;
  86
  87 !           /* Define first default hotkey.  Keep the hotkey string NUL
  88 !            * terminated to avoid reading past the end. */
  89 !           hotkp[copy_char(buttons, hotkp, TRUE)] = NUL;
  90
  91             /* Remember where the choices start, displaying starts here when
  92              * "hotkp" typed at the more prompt. */
  93 *** ../vim-7.1.019/src/version.c        Thu Jul  5 09:53:20 2007
  94 --- src/version.c       Thu Jul  5 10:09:34 2007
  95 ***************
  96 *** 668,669 ****
  97 --- 668,671 ----
  98   {   /* Add new patch number below this line */
  99 + /**/
 100 +     20,
 101   /**/
 102
 103 --
 104 BLACK KNIGHT:  Come on you pansy!
 105     [hah] [parry thrust]
 106     [ARTHUR chops the BLACK KNIGHT's right arm off]
 107 ARTHUR:        Victory is mine!  [kneeling]
 108                We thank thee Lord, that in thy merc-
 109     [Black Knight kicks Arthur in the head while he is praying]
 110                                   The Quest for the Holy Grail (Monty Python)
 111
 112  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 113 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 114 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 115  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///