From 74bb6faea9d59d88d762b6beef4ec89bff0a4ef4 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Dec 2004 06:46:19 +0000
Subject: * ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV  
 (rollback the previous commit).

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   | 5 +++++
 ext/openssl/ossl_x509name.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20ccd70b8..a4e36d3ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
+	  (rollback the previous commit).
+
 Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 4a077af2d..fdd94da15 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -185,13 +185,13 @@ ossl_x509name_to_a(VALUE self)
     const char *short_name;
     VALUE ary, ret;
 	
+    GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
     if (entries < 0) {
 	OSSL_Debug("name entries < 0!");
 	return rb_ary_new();
     }
     ret = rb_ary_new2(entries);
-    GetX509Name(self, name);
     for (i=0; i<entries; i++) {
 	if (!(entry = X509_NAME_get_entry(name, i))) {
 	    ossl_raise(eX509NameError, NULL);
-- 
cgit