jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.026
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.026
8b9a1c
Problem:    Clang warning for int shift overflow.
8b9a1c
Solution:   Use unsigned and cast back to int. (Dominique Pelle)
8b9a1c
Files:	    src/misc2.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.025/src/misc2.c	2013-07-07 16:03:35.000000000 +0200
8b9a1c
--- src/misc2.c	2013-09-08 16:04:54.000000000 +0200
8b9a1c
***************
8b9a1c
*** 6496,6508 ****
8b9a1c
  get4c(fd)
8b9a1c
      FILE	*fd;
8b9a1c
  {
8b9a1c
!     int		n;
8b9a1c
  
8b9a1c
!     n = getc(fd);
8b9a1c
!     n = (n << 8) + getc(fd);
8b9a1c
!     n = (n << 8) + getc(fd);
8b9a1c
!     n = (n << 8) + getc(fd);
8b9a1c
!     return n;
8b9a1c
  }
8b9a1c
  
8b9a1c
  /*
8b9a1c
--- 6496,6510 ----
8b9a1c
  get4c(fd)
8b9a1c
      FILE	*fd;
8b9a1c
  {
8b9a1c
!     /* Use unsigned rather than int otherwise result is undefined
8b9a1c
!      * when left-shift sets the MSB. */
8b9a1c
!     unsigned	n;
8b9a1c
  
8b9a1c
!     n = (unsigned)getc(fd);
8b9a1c
!     n = (n << 8) + (unsigned)getc(fd);
8b9a1c
!     n = (n << 8) + (unsigned)getc(fd);
8b9a1c
!     n = (n << 8) + (unsigned)getc(fd);
8b9a1c
!     return (int)n;
8b9a1c
  }
8b9a1c
  
8b9a1c
  /*
8b9a1c
*** ../vim-7.4.025/src/version.c	2013-09-08 16:03:40.000000000 +0200
8b9a1c
--- src/version.c	2013-09-08 16:05:40.000000000 +0200
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     26,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
A computer program does what you tell it to do, not what you want it to do.
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///