kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (rb_infinity, rb_nan): use union to prevent bus error

Browse source 
caused by misalignment.  [Bug #5469] [ruby-dev:44657]
* include/ruby/missing.h (INFINITY, NAN): ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2011-10-21 17:34:58 +00:00
parent cb2a69d883
commit 971769cd76
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Oct 22 02:07:48 2011 Naohisa Goto <ngotogenome@gmail.com>
* numeric.c (rb_infinity, rb_nan): use union to prevent bus error
caused by misalignment. [Bug #5469] [ruby-dev:44657]
* include/ruby/missing.h (INFINITY, NAN): ditto
Fri Oct 21 22:02:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (initial_params): pack in a struct.

15
include/ruby/missing.h
View file

@ -124,20 +124,27 @@ RUBY_EXTERN double lgamma_r(double, int *);
RUBY_EXTERN double cbrt(double);
#endif
#if !defined(INFINITY) || !defined(NAN)
union bytesequence4_or_float {
unsigned char bytesequence[4];
float float_value;
};
#endif
#ifdef INFINITY
# define HAVE_INFINITY
#else
/** @internal */
RUBY_EXTERN const unsigned char rb_infinity[];
# define INFINITY (*(float *)rb_infinity)
RUBY_EXTERN const union bytesequence4_or_float rb_infinity;
# define INFINITY (rb_infinity.float_value)
#endif
#ifdef NAN
# define HAVE_NAN
#else
/** @internal */
RUBY_EXTERN const unsigned char rb_nan[];
# define NAN (*(float *)rb_nan)
RUBY_EXTERN const union bytesequence4_or_float rb_nan;
# define NAN (rb_nan.float_value)
#endif
#ifndef isinf

8
numeric.c
View file

@ -66,16 +66,16 @@
#ifdef HAVE_INFINITY
#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
const unsigned char rb_infinity[] = "\x00\x00\x80\x7f";
const union bytesequence4_or_float rb_infinity = { 0x00, 0x00, 0x80, 0x7f };
#else
const unsigned char rb_infinity[] = "\x7f\x80\x00\x00";
const union bytesequence4_or_float rb_infinity = { 0x7f, 0x80, 0x00, 0x00 };
#endif
#ifdef HAVE_NAN
#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
const unsigned char rb_nan[] = "\x00\x00\xc0\x7f";
const union bytesequence4_or_float rb_nan = { 0x00, 0x00, 0xc0, 0x7f };
#else
const unsigned char rb_nan[] = "\x7f\xc0\x00\x00";
const union bytesequence4_or_float rb_nan = { 0x7f, 0xc0, 0x00, 0x00 };
#endif
#ifndef HAVE_ROUND