Skip to content

Commit

Permalink
Merge pull request #2345 from sparklemotion/flavorjones-fix-memory-leaks
Browse files Browse the repository at this point in the history 
fix memory leaks
  • Loading branch information
@flavorjones
flavorjones authored Oct 22, 2021
2 parents 9727445 + 2e71c19 commit 3aadf16
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 97 deletions.
70 changes: 35 additions & 35 deletions ext/nokogiri/xml_document.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,59 +533,59 @@ block_caller(void *ctx, xmlNodePtr c_node, xmlNodePtr c_parent_node)
static VALUE
rb_xml_document_canonicalize(int argc, VALUE *argv, VALUE self)
{
VALUE mode;
VALUE incl_ns;
VALUE with_comments;
xmlChar **ns;
long ns_len, i;
VALUE rb_mode;
VALUE rb_namespaces;
VALUE rb_comments_p;
xmlChar **c_namespaces;

xmlDocPtr doc;
xmlOutputBufferPtr buf;
xmlC14NIsVisibleCallback cb = NULL;
void *ctx = NULL;
xmlDocPtr c_doc;
xmlOutputBufferPtr c_obuf;
xmlC14NIsVisibleCallback c_callback_wrapper = NULL;
void *rb_callback = NULL;

VALUE rb_cStringIO;
VALUE io;
VALUE rb_io;

rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
rb_scan_args(argc, argv, "03", &rb_mode, &rb_namespaces, &rb_comments_p);
if (!NIL_P(rb_mode)) { Check_Type(rb_mode, T_FIXNUM); }
if (!NIL_P(rb_namespaces)) { Check_Type(rb_namespaces, T_ARRAY); }

Data_Get_Struct(self, xmlDoc, doc);
Data_Get_Struct(self, xmlDoc, c_doc);

rb_cStringIO = rb_const_get_at(rb_cObject, rb_intern("StringIO"));
io = rb_class_new_instance(0, 0, rb_cStringIO);
buf = xmlAllocOutputBuffer(NULL);
rb_io = rb_class_new_instance(0, 0, rb_cStringIO);
c_obuf = xmlAllocOutputBuffer(NULL);

buf->writecallback = (xmlOutputWriteCallback)noko_io_write;
buf->closecallback = (xmlOutputCloseCallback)noko_io_close;
buf->context = (void *)io;
c_obuf->writecallback = (xmlOutputWriteCallback)noko_io_write;
c_obuf->closecallback = (xmlOutputCloseCallback)noko_io_close;
c_obuf->context = (void *)rb_io;

if (rb_block_given_p()) {
cb = block_caller;
ctx = (void *)rb_block_proc();
c_callback_wrapper = block_caller;
rb_callback = (void *)rb_block_proc();
}

if (NIL_P(incl_ns)) {
ns = NULL;
if (NIL_P(rb_namespaces)) {
c_namespaces = NULL;
} else {
Check_Type(incl_ns, T_ARRAY);
ns_len = RARRAY_LEN(incl_ns);
ns = calloc((size_t)ns_len + 1, sizeof(xmlChar *));
for (i = 0 ; i < ns_len ; i++) {
VALUE entry = rb_ary_entry(incl_ns, i);
ns[i] = (xmlChar *)StringValueCStr(entry);
long ns_len = RARRAY_LEN(rb_namespaces);
c_namespaces = calloc((size_t)ns_len + 1, sizeof(xmlChar *));
for (int j = 0 ; j < ns_len ; j++) {
VALUE entry = rb_ary_entry(rb_namespaces, j);
c_namespaces[j] = (xmlChar *)StringValueCStr(entry);
}
}

xmlC14NExecute(c_doc, c_callback_wrapper, rb_callback,
(int)(NIL_P(rb_mode) ? 0 : NUM2INT(rb_mode)),
c_namespaces,
(int)RTEST(rb_comments_p),
c_obuf);

xmlC14NExecute(doc, cb, ctx,
(int)(NIL_P(mode) ? 0 : NUM2INT(mode)),
ns,
(int) RTEST(with_comments),
buf);

xmlOutputBufferClose(buf);
free(c_namespaces);
xmlOutputBufferClose(c_obuf);

return rb_funcall(io, rb_intern("string"), 0);
return rb_funcall(rb_io, rb_intern("string"), 0);
}

VALUE
Expand Down
36 changes: 25 additions & 11 deletions ext/nokogiri/xml_encoding_handler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,82 @@
VALUE cNokogiriEncodingHandler;


static void
_xml_encoding_handler_dealloc(xmlCharEncodingHandlerPtr c_handler)
{
/* make sure iconv handlers are cleaned up and freed */
xmlCharEncCloseFunc(c_handler);
}


/*
* call-seq: Nokogiri::EncodingHandler.[](name)
*
* Get the encoding handler for +name+
*/
static VALUE
get(VALUE klass, VALUE key)
rb_xml_encoding_handler_s_get(VALUE klass, VALUE key)
{
xmlCharEncodingHandlerPtr handler;

handler = xmlFindCharEncodingHandler(StringValueCStr(key));
if (handler) {
return Data_Wrap_Struct(klass, NULL, NULL, handler);
return Data_Wrap_Struct(klass, NULL, _xml_encoding_handler_dealloc, handler);
}

return Qnil;
}


/*
* call-seq: Nokogiri::EncodingHandler.delete(name)
*
* Delete the encoding alias named +name+
*/
static VALUE
delete (VALUE klass, VALUE name)
rb_xml_encoding_handler_s_delete(VALUE klass, VALUE name)
{
if (xmlDelEncodingAlias(StringValueCStr(name))) { return Qnil; }

return Qtrue;
}


/*
* call-seq: Nokogiri::EncodingHandler.alias(from, to)
*
* Alias encoding handler with name +from+ to name +to+
*/
static VALUE
alias(VALUE klass, VALUE from, VALUE to)
rb_xml_encoding_handler_s_alias(VALUE klass, VALUE from, VALUE to)
{
xmlAddEncodingAlias(StringValueCStr(from), StringValueCStr(to));

return to;
}


/*
* call-seq: Nokogiri::EncodingHandler.clear_aliases!
*
* Remove all encoding aliases.
*/
static VALUE
clear_aliases(VALUE klass)
rb_xml_encoding_handler_s_clear_aliases(VALUE klass)
{
xmlCleanupEncodingAliases();

return klass;
}


/*
* call-seq: name
*
* Get the name of this EncodingHandler
*/
static VALUE
name(VALUE self)
rb_xml_encoding_handler_name(VALUE self)
{
xmlCharEncodingHandlerPtr handler;

Expand All @@ -75,16 +87,18 @@ name(VALUE self)
return NOKOGIRI_STR_NEW2(handler->name);
}


void
noko_init_xml_encoding_handler()
{
cNokogiriEncodingHandler = rb_define_class_under(mNokogiri, "EncodingHandler", rb_cObject);

rb_undef_alloc_func(cNokogiriEncodingHandler);

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);
rb_define_singleton_method(cNokogiriEncodingHandler, "[]", rb_xml_encoding_handler_s_get, 1);
rb_define_singleton_method(cNokogiriEncodingHandler, "delete", rb_xml_encoding_handler_s_delete, 1);
rb_define_singleton_method(cNokogiriEncodingHandler, "alias", rb_xml_encoding_handler_s_alias, 2);
rb_define_singleton_method(cNokogiriEncodingHandler, "clear_aliases!", rb_xml_encoding_handler_s_clear_aliases, 0);

rb_define_method(cNokogiriEncodingHandler, "name", rb_xml_encoding_handler_name, 0);
}
99 changes: 50 additions & 49 deletions ext/nokogiri/xml_xpath_context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,44 @@ register_variable(VALUE self, VALUE name, VALUE value)
return self;
}


/*
* convert an XPath object into a Ruby object of the appropriate type.
* returns Qundef if no conversion was possible.
*/
static VALUE
xpath2ruby(xmlXPathObjectPtr xobj, xmlXPathContextPtr xctx)
{
VALUE retval;

assert(xctx->doc);
assert(DOC_RUBY_OBJECT_TEST(xctx->doc));

switch (xobj->type) {
case XPATH_STRING:
retval = NOKOGIRI_STR_NEW2(xobj->stringval);
xmlFree(xobj->stringval);
return retval;

case XPATH_NODESET:
return noko_xml_node_set_wrap(xobj->nodesetval,
DOC_RUBY_OBJECT(xctx->doc));

case XPATH_NUMBER:
return rb_float_new(xobj->floatval);

case XPATH_BOOLEAN:
return (xobj->boolval == 1) ? Qtrue : Qfalse;

default:
return Qundef;
}
}

void
Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler,
const char *function_name)
{
int i;
VALUE result, doc;
VALUE *argv;
VALUE node_set = Qnil;
Expand All @@ -143,40 +176,25 @@ Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, i
assert(DOC_RUBY_OBJECT_TEST(ctx->context->doc));

argv = (VALUE *)calloc((size_t)nargs, sizeof(VALUE));
for (i = 0 ; i < nargs ; ++i) {
rb_gc_register_address(&argv[i]);
for (int j = 0 ; j < nargs ; ++j) {
rb_gc_register_address(&argv[j]);
}

doc = DOC_RUBY_OBJECT(ctx->context->doc);

if (nargs > 0) {
i = nargs - 1;
do {
obj = valuePop(ctx);
switch (obj->type) {
case XPATH_STRING:
argv[i] = NOKOGIRI_STR_NEW2(obj->stringval);
break;
case XPATH_BOOLEAN:
argv[i] = obj->boolval == 1 ? Qtrue : Qfalse;
break;
case XPATH_NUMBER:
argv[i] = rb_float_new(obj->floatval);
break;
case XPATH_NODESET:
argv[i] = noko_xml_node_set_wrap(obj->nodesetval, doc);
break;
default:
argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
}
xmlXPathFreeNodeSetList(obj);
} while (i-- > 0);
for (int j = nargs - 1 ; j >= 0 ; --j) {
obj = valuePop(ctx);
argv[j] = xpath2ruby(obj, ctx->context);
if (argv[j] == Qundef) {
argv[j] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
}
xmlXPathFreeNodeSetList(obj);
}

result = rb_funcall2(handler, rb_intern((const char *)function_name), nargs, argv);

for (i = 0 ; i < nargs ; ++i) {
rb_gc_unregister_address(&argv[i]);
for (int j = 0 ; j < nargs ; ++j) {
rb_gc_unregister_address(&argv[j]);
}
free(argv);

Expand Down Expand Up @@ -275,7 +293,7 @@ static VALUE
evaluate(int argc, VALUE *argv, VALUE self)
{
VALUE search_path, xpath_handler;
VALUE thing = Qnil;
VALUE retval = Qnil;
xmlXPathContextPtr ctx;
xmlXPathObjectPtr xpath;
xmlChar *query;
Expand Down Expand Up @@ -310,31 +328,14 @@ evaluate(int argc, VALUE *argv, VALUE self)
rb_exc_raise(Nokogiri_wrap_xml_syntax_error(error));
}

assert(ctx->doc);
assert(DOC_RUBY_OBJECT_TEST(ctx->doc));

switch (xpath->type) {
case XPATH_STRING:
thing = NOKOGIRI_STR_NEW2(xpath->stringval);
xmlFree(xpath->stringval);
break;
case XPATH_NODESET:
thing = noko_xml_node_set_wrap(xpath->nodesetval,
DOC_RUBY_OBJECT(ctx->doc));
break;
case XPATH_NUMBER:
thing = rb_float_new(xpath->floatval);
break;
case XPATH_BOOLEAN:
thing = xpath->boolval == 1 ? Qtrue : Qfalse;
break;
default:
thing = noko_xml_node_set_wrap(NULL, DOC_RUBY_OBJECT(ctx->doc));
retval = xpath2ruby(xpath, ctx);
if (retval == Qundef) {
retval = noko_xml_node_set_wrap(NULL, DOC_RUBY_OBJECT(ctx->doc));
}

xmlXPathFreeNodeSetList(xpath);

return thing;
return retval;
}

/*
Expand Down
12 changes: 10 additions & 2 deletions test/xml/test_xpath.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,22 @@ def test_unknown_attribute
assert_nil @xml.xpath('//employee[@id="asdfasdf"]/@fooo')[0]
end

def test_boolean
def test_boolean_false
assert_equal false, @xml.xpath('1 = 2')
end

def test_number
def test_boolean_true
assert_equal true, @xml.xpath('1 = 1')
end

def test_number_integer
assert_equal 2, @xml.xpath('1 + 1')
end

def test_number_float
assert_equal 1.5, @xml.xpath('1.5')
end

def test_string
assert_equal 'foo', @xml.xpath('concat("fo", "o")')
end
Expand Down

0 comments on commit 3aadf16

Please sign in to comment.