kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f. 

[ruby-dev:25101]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2004-12-07 18:34:29 +00:00
parent bebc2eb8c7
commit 25a637eff5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

19
ext/openssl/ossl_bio.c
View File

@ -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;
}