diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-10-08 20:34:31 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-10-08 20:34:31 +0400 |
| commit | 2fb56bbfaa9f6cc2787bb1f50a666bf65e7d227a (patch) | |
| tree | 238c69992c6cf67a81b451556eee92cd7deee28b /winsup/cygwin | |
| parent | 2bf7d695ea36df8de23929761895fccea69dc2bc (diff) | |
* syscall.cc (ffs): Fix crash of ffs (0x80000000) on 64 bit.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bd2eb01c9..c42766b93 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Christian Franke <franke@computer.org> + + * syscall.cc (ffs): Fix crash of ffs (0x80000000) on 64 bit. + 2014-10-08 Corinna Vinschen <corinna@vinschen.de> * fhandler_process.cc (format_process_statm): Fix output of dirty diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 15ebf4900..044e0036a 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -3847,10 +3847,9 @@ ffs (int i) 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 }; - unsigned long int a; - unsigned long int x = i & -i; + unsigned x = i & -i; - a = x <= 0xffff ? (x <= 0xff ? 0 : 8) : (x <= 0xffffff ? 16 : 24); + int a = x <= 0xffff ? (x <= 0xff ? 0 : 8) : (x <= 0xffffff ? 16 : 24); return table[x >> a] + a; } |