diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-06-21 19:00:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-06-21 19:00:43 +0000 |
| commit | 8fdda7afb883589b46e423f91f32988373670bfa (patch) | |
| tree | 10b02e9952aa608262faa00e92fe9157f662491c | |
| parent | f3bc5e5a3ef622f1ec11962b7ce08a92ded03bea (diff) | |
| download | glibc-8fdda7afb883589b46e423f91f32988373670bfa.tar.gz glibc-8fdda7afb883589b46e423f91f32988373670bfa.tar.xz glibc-8fdda7afb883589b46e423f91f32988373670bfa.zip | |
Fix bad shift in soft-fp (bug 7006).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 24 | ||||
| -rw-r--r-- | soft-fp/op-common.h | 5 |
3 files changed, 21 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index f3ac800428..5a62155eb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-06-21 Joseph Myers <joseph@codesourcery.com> + + [BZ #7006] + * soft-fp/op-common.h (_FP_FROM_INT): Do not call _FP_FRAC_SLL + with a shift of 0 bits. + 2013-06-21 Maciej W. Rozycki <macro@codesourcery.com> * dlfcn/Makefile (tststatic2-ENV): Redefine in terms of diff --git a/NEWS b/NEWS index f8aa622692..01d70f4111 100644 --- a/NEWS +++ b/NEWS @@ -9,18 +9,18 @@ Version 2.18 * The following bugs are resolved with this release: - 2546, 2560, 5159, 6809, 10060, 10062, 10357, 10686, 11120, 11561, 12387, - 12515, 12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200, 14256, - 14280, 14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812, 14888, - 14894, 14907, 14908, 14909, 14920, 14952, 14964, 14981, 14982, 14985, - 14991, 14994, 14996, 15000, 15003, 15006, 15007, 15014, 15020, 15023, - 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15100, 15160, - 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307, - 15309, 15327, 15330, 15335, 15336, 15337, 15339, 15342, 15346, 15359, - 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406, 15409, 15416, - 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441, 15442, - 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497, 15506, - 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654. + 2546, 2560, 5159, 6809, 7006, 10060, 10062, 10357, 10686, 11120, 11561, + 12387, 12515, 12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200, + 14256, 14280, 14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812, + 14888, 14894, 14907, 14908, 14909, 14920, 14952, 14964, 14981, 14982, + 14985, 14991, 14994, 14996, 15000, 15003, 15006, 15007, 15014, 15020, + 15023, 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15100, + 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305, + 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15339, 15342, 15346, + 15359, 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406, 15409, + 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441, + 15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497, + 15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654. * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla #15078). diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h index ce472e0d5e..c4acb99161 100644 --- a/soft-fp/op-common.h +++ b/soft-fp/op-common.h @@ -1163,8 +1163,9 @@ do { \ { \ /* Exactly representable; shift left. */ \ _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \ - _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs \ - + _FP_FRACBITS_##fs - 1 - X##_e)); \ + if (_FP_EXPBIAS_##fs + _FP_FRACBITS_##fs - 1 - X##_e > 0) \ + _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs \ + + _FP_FRACBITS_##fs - 1 - X##_e)); \ } \ else \ { \ |