archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 54256,54291,54292,54293: [Backport #12118] [Bug #12218]

Browse source 
* thread_pthread.c (reserve_stack): fix reserving position where
	  the stack growing bottom to top. [Bug #12118]

	* localeinit.c (rb_locale_charmap_index): fix prototype.
	  patched by Andreas Schwab [Bug #12218]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 17:22:04 +00:00
parent 710fe14b5d
commit 50864b9d01
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Mar 30 02:20:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
* localeinit.c (rb_locale_charmap_index): fix prototype.
patched by Andreas Schwab [Bug #12218]
Wed Mar 30 02:20:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
* thread_pthread.c (reserve_stack): fix reserving position where
the stack growing bottom to top. [Bug #12118]
Wed Mar 30 02:17:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/file.c (rb_readlink): drop garbage after the substitute

2
localeinit.c
View file

@ -89,7 +89,7 @@ enc_find_index(const char *name)
}
int
rb_locale_charmap_index(VALUE klass)
rb_locale_charmap_index(void)
{
return (int)locale_charmap(enc_find_index);
}

26
thread_pthread.c
View file

@ -693,17 +693,31 @@ reserve_stack(volatile char *limit, size_t size)
const volatile char *end = buf + sizeof(buf);
limit += size;
if (limit > end) {
size = limit - end;
limit = alloca(size);
limit[stack_check_margin+size-1] = 0;
/* |<-bottom (=limit(a)) top->|
* | .. |<-buf 256B |<-end | stack check |
* | 256B | =size= | margin (4KB)|
* | =size= limit(b)->| 256B | |
* | | alloca(sz) | | |
* | .. |<-buf |<-limit(c) [sz-1]->0> | |
*/
size_t sz = limit - end;
limit = alloca(sz);
limit[sz-1] = 0;
}
}
else {
limit -= size;
if (buf > limit) {
limit = alloca(buf - limit);
limit[0] = 0; /* ensure alloca is called */
limit -= stack_check_margin;
/* |<-top (=limit(a)) bottom->|
* | .. | 256B buf->| | stack check |
* | 256B | =size= | margin (4KB)|
* | =size= limit(b)->| 256B | |
* | | alloca(sz) | | |
* | .. | buf->| limit(c)-><0> | |
*/
size_t sz = buf - limit;
limit = alloca(sz);
limit[0] = 0;
}
}
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-30"
#define RUBY_PATCHLEVEL 69
#define RUBY_PATCHLEVEL 70
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3