Skip to content

Allocate OpenSSL objects in #initialize{,_copy} #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhenium wants to merge 10 commits into
base: master
Choose a base branch
from
+426 −707
Open

Allocate OpenSSL objects in #initialize{,_copy} #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d38a572
ts: do not use the "reuse" behavior of d2i_*{,_bio}() functions
rhenium Apr 29, 2026
0b7debd
pkcs12: add missing error check for d2i_PKCS12_bio()
rhenium Apr 29, 2026
74f7c4a
ossl.c: add helper function ossl_want_uninitialized()
rhenium Dec 25, 2025
a5d7d89
ocsp: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
ca2d2d4
pkcs12: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
aaa547c
x509*: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
93db336
ts: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
22cdcbc
provider: fix potential memory leak in .load
rhenium Dec 6, 2025
21add9f
pkcs7: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
1c7f29a
ns_spki: allocate OpenSSL objects in #initialize{,_copy}
rhenium Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ext/openssl/ossl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ extern VALUE eOSSLError;
}\
} while (0)

static inline void
ossl_want_uninitialized(VALUE self, const rb_data_type_t *type)
{
if (rb_check_typeddata(self, type)) {
rb_raise(rb_eTypeError, "%"PRIsVALUE" already initialized",
rb_obj_class(self));
}
}

/*
* Type conversions
*/
Expand Down
31 changes: 10 additions & 21 deletions ext/openssl/ossl_ns_spki.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
*/
#include "ossl.h"

#define NewSPKI(klass) \
TypedData_Wrap_Struct((klass), &ossl_netscape_spki_type, 0)
#define SetSPKI(obj, spki) do { \
if (!(spki)) { \
ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
} \
RTYPEDDATA_DATA(obj) = (spki); \
} while (0)
#define GetSPKI(obj, spki) do { \
TypedData_Get_Struct((obj), NETSCAPE_SPKI, &ossl_netscape_spki_type, (spki)); \
if (!(spki)) { \
Expand Down Expand Up @@ -56,16 +48,7 @@ static const rb_data_type_t ossl_netscape_spki_type = {
static VALUE
ossl_spki_alloc(VALUE klass)
{
NETSCAPE_SPKI *spki;
VALUE obj;

obj = NewSPKI(klass);
if (!(spki = NETSCAPE_SPKI_new())) {
ossl_raise(eSPKIError, NULL);
}
SetSPKI(obj, spki);

return obj;
return TypedData_Wrap_Struct(klass, &ossl_netscape_spki_type, 0);
}

/*
Expand All @@ -82,7 +65,14 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
VALUE buffer;
const unsigned char *p;

if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
rb_scan_args(argc, argv, "01", &buffer);
rb_check_frozen(self);
ossl_want_uninitialized(self, &ossl_netscape_spki_type);
if (argc == 0) {
spki = NETSCAPE_SPKI_new();
if (!spki)
ossl_raise(eSPKIError, "NETSCAPE_SPKI_new");
RTYPEDDATA_DATA(self) = spki;
return self;
}
StringValue(buffer);
Expand All @@ -93,8 +83,7 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
ossl_raise(eSPKIError, NULL);
}
}
NETSCAPE_SPKI_free(DATA_PTR(self));
SetSPKI(self, spki);
RTYPEDDATA_DATA(self) = spki;

return self;
}
Expand Down
Loading