* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]

* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.

* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.

* struct.c (make_struct): [ruby-dev:25249]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 1 deletions

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 29ab2c7d7b..c395373ff2 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -732,7 +732,7 @@ iconv_iconv
 
     return iconv_convert(VALUE2ICONV(cd), str,
 			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n1),
+                        NIL_P(n2) ? -1 : NUM2INT(n2),
 			 NULL);
 }
 
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index a961c16bc0..abea6f5f0c 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -816,6 +816,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     StringValue(obj);
+    obj = rb_str_new4(obj);
     p = RSTRING(obj)->ptr;
     ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 1);
 
@@ -831,6 +832,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     StringValue(obj);
+    obj = rb_str_new4(obj);
     p = RSTRING(obj)->ptr;
     ary = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 1, 0);
     ret = rb_ary_entry(ary, 0);
@@ -847,6 +849,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     StringValue(obj);
+    obj = rb_str_new4(obj);
     p = RSTRING(obj)->ptr;
     ret = ossl_asn1_decode0(&p, RSTRING(obj)->len, &offset, 0, 0, 0);