1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use

Browse Source 
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
This commit is contained in:
nobu 2009-03-13 06:10:45 +00:00
parent ffbaa25b62
commit 9300355bec
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Fri Mar 13 10:42:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (AC_HEADER_DIRENT): added. * configure.in (AC_HEADER_DIRENT): added.

6
ext/openssl/ossl_x509ext.c
View File

@ -325,15 +325,15 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
ossl_raise(eX509ExtError, "malloc error"); ossl_raise(eX509ExtError, "malloc error");
memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data)); memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
if(!(asn1s = ASN1_OCTET_STRING_new())){ if(!(asn1s = ASN1_OCTET_STRING_new())){
free(s); OPENSSL_free(s);
ossl_raise(eX509ExtError, NULL); ossl_raise(eX509ExtError, NULL);
} }
if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){ if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){
free(s); OPENSSL_free(s);
ASN1_OCTET_STRING_free(asn1s); ASN1_OCTET_STRING_free(asn1s);
ossl_raise(eX509ExtError, NULL); ossl_raise(eX509ExtError, NULL);
} }
free(s); OPENSSL_free(s);
GetX509Ext(self, ext); GetX509Ext(self, ext);
X509_EXTENSION_set_data(ext, asn1s); X509_EXTENSION_set_data(ext, asn1s);