diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-07 10:05:59 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-07 10:05:59 +0000 |
| commit | 15fbb87b594a47ed622829cfdd6891eb97ea4726 (patch) | |
| tree | 3466fe9a8eed84ef481ab3fd5407df92dc356b9b | |
| parent | d18b653719687756c82c7c800dee5e91b388fefd (diff) | |
| download | ruby-15fbb87b594a47ed622829cfdd6891eb97ea4726.tar.gz | |
merge revision(s) 30993:
* ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported by Drew Yao <ayao at apple.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/bigdecimal/bigdecimal.c | 8 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Jun 7 19:00:35 2012 Kenta Murata <mrkn@mrkn.jp> + + * ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported + by Drew Yao <ayao at apple.com> + Wed Jun 6 15:09:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 16be5207ba..7ebb3f76fc 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -2032,11 +2032,11 @@ static int gnAlloc=0; /* Memory allocation counter */ VP_EXPORT void * VpMemAlloc(U_LONG mb) { - void *p = xmalloc((unsigned int)mb); - if(!p) { - VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1); + void *p = xmalloc(mb); + if (!p) { + VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1); } - memset(p,0,mb); + memset(p, 0, mb); #ifdef _DEBUG gnAlloc++; /* Count allocation call */ #endif /* _DEBUG */ @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2012-06-06" +#define RUBY_RELEASE_DATE "2012-06-07" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20120606 -#define RUBY_PATCHLEVEL 366 +#define RUBY_RELEASE_CODE 20120607 +#define RUBY_PATCHLEVEL 367 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |