From 25a637eff54787ecc2f40b33fca38c34773fd4e4 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Dec 2004 18:34:29 +0000
Subject: [PATCH] * 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
---
 ChangeLog              |  5 +++++
 ext/openssl/ossl_bio.c | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcdfce1367..6b93dcee76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
 }