home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.739 < prev    next >
Encoding:
Internet Message Format  |  2012-11-27  |  2.3 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.739
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.739
  11. Problem:    Computing number of lines may have an integer overflow.
  12. Solution:   Check for MAXCOL explicitly. (Dominique Pelle)
  13. Files:        src/move.c
  14.  
  15.  
  16. *** ../vim-7.3.738/src/move.c    2012-03-28 14:19:46.000000000 +0200
  17. --- src/move.c    2012-11-28 18:15:42.000000000 +0100
  18. ***************
  19. *** 2576,2582 ****
  20.       else
  21.       topline_back(lp);
  22.       h2 = lp->height;
  23. !     if (h2 + h1 > min_height)
  24.       {
  25.       *lp = loff0;    /* no overlap */
  26.       return;
  27. --- 2576,2582 ----
  28.       else
  29.       topline_back(lp);
  30.       h2 = lp->height;
  31. !     if (h2 == MAXCOL || h2 + h1 > min_height)
  32.       {
  33.       *lp = loff0;    /* no overlap */
  34.       return;
  35. ***************
  36. *** 2588,2594 ****
  37.       else
  38.       topline_back(lp);
  39.       h3 = lp->height;
  40. !     if (h3 + h2 > min_height)
  41.       {
  42.       *lp = loff0;    /* no overlap */
  43.       return;
  44. --- 2588,2594 ----
  45.       else
  46.       topline_back(lp);
  47.       h3 = lp->height;
  48. !     if (h3 == MAXCOL || h3 + h2 > min_height)
  49.       {
  50.       *lp = loff0;    /* no overlap */
  51.       return;
  52. ***************
  53. *** 2600,2606 ****
  54.       else
  55.       topline_back(lp);
  56.       h4 = lp->height;
  57. !     if (h4 + h3 + h2 > min_height || h3 + h2 + h1 > min_height)
  58.       *lp = loff1;    /* 1 line overlap */
  59.       else
  60.       *lp = loff2;    /* 2 lines overlap */
  61. --- 2600,2606 ----
  62.       else
  63.       topline_back(lp);
  64.       h4 = lp->height;
  65. !     if (h4 == MAXCOL || h4 + h3 + h2 > min_height || h3 + h2 + h1 > min_height)
  66.       *lp = loff1;    /* 1 line overlap */
  67.       else
  68.       *lp = loff2;    /* 2 lines overlap */
  69. *** ../vim-7.3.738/src/version.c    2012-11-28 17:41:55.000000000 +0100
  70. --- src/version.c    2012-11-28 18:16:40.000000000 +0100
  71. ***************
  72. *** 727,728 ****
  73. --- 727,730 ----
  74.   {   /* Add new patch number below this line */
  75. + /**/
  76. +     739,
  77.   /**/
  78.  
  79. -- 
  80. From "know your smileys":
  81.  !-|    I-am-a-Cylon-Centurian-with-one-red-eye-bouncing-back-and-forth
  82.  
  83.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  84. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  85. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  86.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  87.