diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_bio.c | 19 |
2 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Dec 8 03:26:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f. + [ruby-dev:25101] + Wed Dec 8 03:26:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb. diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c index 8e80f412ee..eba6414339 100644 --- a/ext/openssl/ossl_bio.c +++ b/ext/openssl/ossl_bio.c @@ -17,15 +17,28 @@ ossl_obj2bio(VALUE obj) if (TYPE(obj) == T_FILE) { OpenFile *fptr; + FILE *fp; + int fd; + GetOpenFile(obj, fptr); rb_io_check_readable(fptr); - bio = BIO_new_fp(fptr->f, BIO_NOCLOSE); - } + if ((fd = dup(fptr->fd)) < 0){ + rb_sys_fail(0); + } + if (!(fp = fdopen(fd, "r"))){ + close(fd); + rb_sys_fail(0); + } + if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){ + fclose(fp); + ossl_raise(eOSSLError, NULL); + } + } else { StringValue(obj); bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len); + if (!bio) ossl_raise(eOSSLError, NULL); } - if (!bio) ossl_raise(eOSSLError, NULL); return bio; } |