Skip to content
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.

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

Already on GitHub? Sign in to your account

T_DATA classes should undef the allocator, or define a custom allocator #2249

Merged
merged 2 commits into from May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/nokogiri/html_element_description.c
Expand Up @@ -274,6 +274,8 @@ noko_init_html_element_description()
{
cNokogiriHtmlElementDescription = rb_define_class_under(mNokogiriHtml, "ElementDescription", rb_cObject);

rb_undef_alloc_func(cNokogiriHtmlElementDescription);

rb_define_singleton_method(cNokogiriHtmlElementDescription, "[]", get_description, 1);

rb_define_method(cNokogiriHtmlElementDescription, "name", name, 0);
Expand Down
1 change: 1 addition & 0 deletions ext/nokogiri/nokogiri.h
Expand Up @@ -102,6 +102,7 @@ NOKOPUBVAR VALUE mNokogiriXmlSax ;
NOKOPUBVAR VALUE mNokogiriXmlXpath ;
NOKOPUBVAR VALUE mNokogiriXslt ;

NOKOPUBVAR VALUE cNokogiriEncodingHandler;
NOKOPUBVAR VALUE cNokogiriSyntaxError;
NOKOPUBVAR VALUE cNokogiriXmlAttr;
NOKOPUBVAR VALUE cNokogiriXmlAttributeDecl;
Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_element_content.c
Expand Up @@ -116,6 +116,8 @@ noko_init_xml_element_content()
{
cNokogiriXmlElementContent = rb_define_class_under(mNokogiriXml, "ElementContent", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlElementContent);

rb_define_method(cNokogiriXmlElementContent, "name", get_name, 0);
rb_define_method(cNokogiriXmlElementContent, "type", get_type, 0);
rb_define_method(cNokogiriXmlElementContent, "occur", get_occur, 0);
Expand Down
17 changes: 11 additions & 6 deletions ext/nokogiri/xml_encoding_handler.c
@@ -1,5 +1,8 @@
#include <nokogiri.h>

VALUE cNokogiriEncodingHandler;


/*
* call-seq: Nokogiri::EncodingHandler.[](name)
*
Expand Down Expand Up @@ -75,11 +78,13 @@ name(VALUE self)
void
noko_init_xml_encoding_handler()
{
VALUE klass = rb_define_class_under(mNokogiri, "EncodingHandler", rb_cObject);
cNokogiriEncodingHandler = rb_define_class_under(mNokogiri, "EncodingHandler", rb_cObject);

rb_undef_alloc_func(cNokogiriEncodingHandler);

rb_define_singleton_method(klass, "[]", get, 1);
rb_define_singleton_method(klass, "delete", delete, 1);
rb_define_singleton_method(klass, "alias", alias, 2);
rb_define_singleton_method(klass, "clear_aliases!", clear_aliases, 0);
rb_define_method(klass, "name", name, 0);
rb_define_singleton_method(cNokogiriEncodingHandler, "[]", get, 1);
rb_define_singleton_method(cNokogiriEncodingHandler, "delete", delete, 1);
rb_define_singleton_method(cNokogiriEncodingHandler, "alias", alias, 2);
rb_define_singleton_method(cNokogiriEncodingHandler, "clear_aliases!", clear_aliases, 0);
rb_define_method(cNokogiriEncodingHandler, "name", name, 0);
}
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_namespace.c
Expand Up @@ -113,6 +113,8 @@ noko_init_xml_namespace()
{
cNokogiriXmlNamespace = rb_define_class_under(mNokogiriXml, "Namespace", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlNamespace);

rb_define_method(cNokogiriXmlNamespace, "prefix", prefix, 0);
rb_define_method(cNokogiriXmlNamespace, "href", href, 0);
}
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_node.c
Expand Up @@ -1760,6 +1760,8 @@ noko_init_xml_node()
{
cNokogiriXmlNode = rb_define_class_under(mNokogiriXml, "Node", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlNode);

rb_define_singleton_method(cNokogiriXmlNode, "new", rb_xml_node_new, -1);

rb_define_method(cNokogiriXmlNode, "add_namespace_definition", add_namespace_definition, 2);
Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_reader.c
Expand Up @@ -662,6 +662,8 @@ noko_init_xml_reader()
*/
cNokogiriXmlReader = rb_define_class_under(mNokogiriXml, "Reader", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlReader);

rb_define_singleton_method(cNokogiriXmlReader, "from_memory", from_memory, -1);
rb_define_singleton_method(cNokogiriXmlReader, "from_io", from_io, -1);

Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_sax_parser_context.c
Expand Up @@ -265,6 +265,8 @@ noko_init_xml_sax_parser_context()
{
cNokogiriXmlSaxParserContext = rb_define_class_under(mNokogiriXmlSax, "ParserContext", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlSaxParserContext);

rb_define_singleton_method(cNokogiriXmlSaxParserContext, "io", parse_io, 2);
rb_define_singleton_method(cNokogiriXmlSaxParserContext, "memory", parse_memory, 1);
rb_define_singleton_method(cNokogiriXmlSaxParserContext, "file", parse_file, 1);
Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_schema.c
Expand Up @@ -274,6 +274,8 @@ noko_init_xml_schema()
{
cNokogiriXmlSchema = rb_define_class_under(mNokogiriXml, "Schema", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlSchema);

rb_define_singleton_method(cNokogiriXmlSchema, "read_memory", read_memory, -1);
rb_define_singleton_method(cNokogiriXmlSchema, "from_document", from_document, -1);

Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xml_xpath_context.c
Expand Up @@ -373,6 +373,8 @@ noko_init_xml_xpath_context(void)
*/
cNokogiriXmlXpathContext = rb_define_class_under(mNokogiriXml, "XPathContext", rb_cObject);

rb_undef_alloc_func(cNokogiriXmlXpathContext);

rb_define_singleton_method(cNokogiriXmlXpathContext, "new", new, 1);

rb_define_method(cNokogiriXmlXpathContext, "evaluate", evaluate, -1);
Expand Down
2 changes: 2 additions & 0 deletions ext/nokogiri/xslt_stylesheet.c
Expand Up @@ -257,6 +257,8 @@ noko_init_xslt_stylesheet()

cNokogiriXsltStylesheet = rb_define_class_under(mNokogiriXslt, "Stylesheet", rb_cObject);

rb_undef_alloc_func(cNokogiriXsltStylesheet);

rb_define_singleton_method(cNokogiriXsltStylesheet, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
rb_define_method(cNokogiriXsltStylesheet, "serialize", serialize, 1);
rb_define_method(cNokogiriXsltStylesheet, "transform", transform, -1);
Expand Down