From: Eric Wong <e@80x24.org>
To: mwrap-public@80x24.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] Mwrap.dump: do not segfault on invalid IO arg
Date: Sun, 15 Jul 2018 00:58:37 +0000 [thread overview]
Message-ID: <20180715005837.31541-1-e@80x24.org> (raw)
Users may screw up ordering of arguments :x
---
ext/mwrap/mwrap.c | 1 +
test/test_mwrap.rb | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/ext/mwrap/mwrap.c b/ext/mwrap/mwrap.c
index 926bc0e..95705e3 100644
--- a/ext/mwrap/mwrap.c
+++ b/ext/mwrap/mwrap.c
@@ -658,6 +658,7 @@ static VALUE mwrap_dump(int argc, VALUE * argv, VALUE mod)
io = *((VALUE *)dlsym(RTLD_DEFAULT, "rb_stderr"));
a.min = NIL_P(min) ? 0 : NUM2SIZET(min);
+ io = rb_io_get_io(io);
io = rb_io_get_write_io(io);
GetOpenFile(io, fptr);
a.fp = rb_io_stdio_file(fptr);
diff --git a/test/test_mwrap.rb b/test/test_mwrap.rb
index 8a82072..6658749 100644
--- a/test/test_mwrap.rb
+++ b/test/test_mwrap.rb
@@ -199,4 +199,8 @@ class TestMwrap < Test::Unit::TestCase
warn Benchmark::Tms::CAPTION
warn r.read
end if ENV['BENCHMARK']
+
+ def test_mwrap_dump_check
+ assert_raise(TypeError) { Mwrap.dump(:bogus) }
+ end
end
--
EW
reply other threads:[~2018-07-15 0:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://80x24.org/mwrap/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180715005837.31541-1-e@80x24.org \
--to=e@80x24.org \
--cc=mwrap-public@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mwrap.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).