From 9c8d9f31f70a73d041c8c1797a0d795d97ca4412 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 7 Mar 2016 01:58:09 +0000 Subject: win32ole_event.c: use rb_write_error_str * ext/win32ole/win32ole_event.c (rescue_callback): use rb_write_error_str instead of rb_write_error, to respect the encoding and prevent the message from GC. * internal.h (rb_write_error_str): export. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ ext/win32ole/win32ole_event.c | 4 +++- internal.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcd3766f73..0494527b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Mar 7 10:58:07 2016 Nobuyoshi Nakada + + * ext/win32ole/win32ole_event.c (rescue_callback): use + rb_write_error_str instead of rb_write_error, to respect + the encoding and prevent the message from GC. + + * internal.h (rb_write_error_str): export. + Mon Mar 7 01:38:41 2016 Rei Odaira * test/ruby/test_process.rb (test_execopts_gid): Skip a test diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c index 8e30732592..577333bfbb 100644 --- a/ext/win32ole/win32ole_event.c +++ b/ext/win32ole/win32ole_event.c @@ -6,6 +6,8 @@ * WIN32OLE_EVENT objects controls OLE event. */ +RUBY_EXTERN void rb_write_error_str(VALUE mesg); + typedef struct { struct IEventSinkVtbl * lpVtbl; } IEventSink, *PEVENTSINK; @@ -468,7 +470,7 @@ rescue_callback(VALUE arg) VALUE msg = rb_funcall(e, rb_intern("message"), 0); bt = rb_ary_entry(bt, 0); error = rb_sprintf("%"PRIsVALUE": %"PRIsVALUE" (%s)\n", bt, msg, rb_obj_classname(e)); - rb_write_error(StringValuePtr(error)); + rb_write_error_str(error); rb_backtrace(); ruby_finalize(); exit(-1); diff --git a/internal.h b/internal.h index dc3862323a..dfd09844c8 100644 --- a/internal.h +++ b/internal.h @@ -872,7 +872,6 @@ const char *ruby_get_inplace_mode(void); void ruby_set_inplace_mode(const char *); ssize_t rb_io_bufread(VALUE io, void *buf, size_t size); void rb_stdio_set_default_encoding(void); -void rb_write_error_str(VALUE mesg); VALUE rb_io_flush_raw(VALUE, int); size_t rb_io_memsize(const rb_io_t *); @@ -1353,6 +1352,7 @@ VALUE rb_ident_hash_new(void); /* io.c (export) */ void rb_maygvl_fd_fix_cloexec(int fd); int rb_gc_for_fd(int err); +void rb_write_error_str(VALUE mesg); /* numeric.c (export) */ VALUE rb_int_positive_pow(long x, unsigned long y); -- cgit v1.2.3