archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 05:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) r46796: [Backport #10008]

Browse source 
* configure.in (rb_cv_broken_backtrace): exit with failure
	  normally, no needs to abort.  [ruby-core:63678] [Bug #10008]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-09-05 15:55:12 +00:00
parent 0f1fb3d6e3
commit ea08099e88
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 6 00:47:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_broken_backtrace): exit with failure
normally, no needs to abort. [ruby-core:63678] [Bug #10008]
Sat Sep 6 00:05:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Sep 6 00:05:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a * include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a

14
configure.in
View file

@ -2886,24 +2886,25 @@ void sigsegv(int signum, siginfo_t *info, void *ctx){
if (n > 0) { if (n > 0) {
/*fprintf(stdout, "backtrace:%d\n",n);*/ /*fprintf(stdout, "backtrace:%d\n",n);*/
} else { } else {
abort(); _exit(EXIT_FAILURE);
} }
_exit(0); _exit(EXIT_SUCCESS);
} }
int int
main() main(void)
{ {
volatile int *a = NULL;
stack_t ss; stack_t ss;
ss.ss_sp = malloc(SIGSTKSZ); ss.ss_sp = malloc(SIGSTKSZ);
if (ss.ss_sp == NULL) { if (ss.ss_sp == NULL) {
fprintf(stderr, "cannot allocate memory for sigaltstack\n"); fprintf(stderr, "cannot allocate memory for sigaltstack\n");
abort(); return EXIT_FAILURE;
} }
ss.ss_size = SIGSTKSZ; ss.ss_size = SIGSTKSZ;
ss.ss_flags = 0; ss.ss_flags = 0;
if (sigaltstack(&ss, NULL) == -1) { if (sigaltstack(&ss, NULL) == -1) {
fprintf(stderr, "sigaltstack failed\n"); fprintf(stderr, "sigaltstack failed\n");
abort(); return EXIT_FAILURE;
} }
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(struct sigaction)); memset(&sa, 0, sizeof(struct sigaction));
@ -2912,9 +2913,8 @@ main()
sa.sa_flags |= SA_SIGINFO; sa.sa_flags |= SA_SIGINFO;
sa.sa_flags |= SA_ONSTACK; sa.sa_flags |= SA_ONSTACK;
sigaction(SIGSEGV, &sa, NULL); sigaction(SIGSEGV, &sa, NULL);
int *a = NULL;
a[0] = 1; a[0] = 1;
return 0; return EXIT_SUCCESS;
} }
], ],
rb_cv_broken_backtrace=no, rb_cv_broken_backtrace=no,

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-09-06" #define RUBY_RELEASE_DATE "2014-09-06"
#define RUBY_PATCHLEVEL 224 #define RUBY_PATCHLEVEL 225
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9