diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-13 06:10:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-13 06:10:45 +0000 |
| commit | 9300355bec6c21ae165be18ad116ce8651f95e8e (patch) | |
| tree | d51992908aaeb93cc39530fb8c8995c2c658da76 | |
| parent | ffbaa25b6216c67438e739151dee57e035934639 (diff) | |
| download | ruby-9300355bec6c21ae165be18ad116ce8651f95e8e.tar.gz | |
* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
OPENSSL_free instead of free. a patch from Charlie Savage at
[ruby-core:22858].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509ext.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Mar 13 15:10:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use + OPENSSL_free instead of free. a patch from Charlie Savage a + [ruby-core:22858]. + Fri Mar 13 10:42:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (AC_HEADER_DIRENT): added. diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c index 64867039f2..87210700ae 100644 --- a/ext/openssl/ossl_x509ext.c +++ b/ext/openssl/ossl_x509ext.c @@ -325,15 +325,15 @@ ossl_x509ext_set_value(VALUE self, VALUE data) ossl_raise(eX509ExtError, "malloc error"); memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data)); if(!(asn1s = ASN1_OCTET_STRING_new())){ - free(s); + OPENSSL_free(s); ossl_raise(eX509ExtError, NULL); } if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){ - free(s); + OPENSSL_free(s); ASN1_OCTET_STRING_free(asn1s); ossl_raise(eX509ExtError, NULL); } - free(s); + OPENSSL_free(s); GetX509Ext(self, ext); X509_EXTENSION_set_data(ext, asn1s); |