Bug #69166 for XML-LibXML:

Hi, i've added test 49 and changed formating to conform new guidelines. Patch attached - hope its better now ;) Sam On Wed Jun 29 06:47:40 2011, SHLOMIF wrote: Show quoted text

diff -urN XML-LibXML-1.75/LibXML.pm XML-LibXML-1.75-new/LibXML.pm --- XML-LibXML-1.75/LibXML.pm 2011-06-24 18:56:47.000000000 +0200 +++ XML-LibXML-1.75-new/LibXML.pm 2011-06-29 14:42:27.000000000 +0200 @@ -443,6 +443,12 @@ # callback functions # #-------------------------------------------------------------------------# +use Data::Dumper; +sub externalEntityLoader(&) +{ + return _externalEntityLoader($_[0]); +} + sub input_callbacks { my $self = shift; my $icbclass = shift; diff -urN XML-LibXML-1.75/LibXML.xs XML-LibXML-1.75-new/LibXML.xs --- XML-LibXML-1.75/LibXML.xs 2011-06-24 18:38:46.000000000 +0200 +++ XML-LibXML-1.75-new/LibXML.xs 2011-06-29 15:05:55.000000000 +0200 @@ -146,6 +146,9 @@ /* this should keep the default */ static xmlExternalEntityLoader LibXML_old_ext_ent_loader = NULL; +/* global external entity loader */ +SV *EXTERNAL_ENTITY_LOADER_FUNC = (SV *)NULL; + SV* PROXY_NODE_REGISTRY_MUTEX = NULL; /* **************************************************************** @@ -778,8 +781,7 @@ const char * ID, xmlParserCtxtPtr ctxt) { - SV * self; - HV * real_obj; + SV ** func; int count; SV * results; @@ -787,7 +789,8 @@ const char * results_pv; xmlParserInputBufferPtr input_buf; - if (ctxt->_private == NULL) { + if (ctxt->_private == NULL && EXTERNAL_ENTITY_LOADER_FUNC == NULL) + { return xmlNewInputFromFile(ctxt, URL); } @@ -798,11 +801,22 @@ ID = ""; } - self = (SV *)ctxt->_private; - real_obj = (HV *)SvRV(self); - func = hv_fetch(real_obj, "ext_ent_handler", 15, 0); + /* fetch entity loader function */ + if(EXTERNAL_ENTITY_LOADER_FUNC != NULL) + { + func = &EXTERNAL_ENTITY_LOADER_FUNC; + } + else + { + SV * self; + HV * real_obj; + + self = (SV *)ctxt->_private; + real_obj = (HV *)SvRV(self); + func = hv_fetch(real_obj, "ext_ent_handler", 15, 0); + } - if (func != NULL && SvTRUE(*func)) { + if (func != NULL && SvTRUE(*func)) { dTHX; dSP; @@ -899,18 +913,23 @@ if (ctxt) ctxt->linenumbers = 0; } - item = hv_fetch(real_obj, "ext_ent_handler", 15, 0); - if ( item != NULL && SvTRUE(*item)) { - LibXML_old_ext_ent_loader = xmlGetExternalEntityLoader(); - xmlSetExternalEntityLoader( (xmlExternalEntityLoader)LibXML_load_external_entity ); - } - else { - if (parserOptions & XML_PARSE_NONET) { + if(LibXML_old_ext_ent_loader == NULL) + { + item = hv_fetch(real_obj, "ext_ent_handler", 15, 0); + if (item != NULL && SvTRUE(*item)) { LibXML_old_ext_ent_loader = xmlGetExternalEntityLoader(); - xmlSetExternalEntityLoader( xmlNoNetExternalEntityLoader ); + xmlSetExternalEntityLoader( (xmlExternalEntityLoader)LibXML_load_external_entity ); } - /* LibXML_old_ext_ent_loader = NULL; */ - } + else + { + if (parserOptions & XML_PARSE_NONET) + { + LibXML_old_ext_ent_loader = xmlGetExternalEntityLoader(); + xmlSetExternalEntityLoader( xmlNoNetExternalEntityLoader ); + } + /* LibXML_old_ext_ent_loader = NULL; */ + } + } } return real_obj; @@ -921,7 +940,8 @@ #ifndef WITH_SERRORS xmlGetWarningsDefaultValue = 0; #endif - if (LibXML_old_ext_ent_loader != NULL ) { + if (EXTERNAL_ENTITY_LOADER_FUNC == NULL && LibXML_old_ext_ent_loader != NULL) + { xmlSetExternalEntityLoader( (xmlExternalEntityLoader)LibXML_old_ext_ent_loader ); } } @@ -2642,6 +2662,26 @@ OUTPUT: RETVAL +SV* +_externalEntityLoader( loader ) + SV* loader + CODE: + { + RETVAL = EXTERNAL_ENTITY_LOADER_FUNC; + if(EXTERNAL_ENTITY_LOADER_FUNC == NULL) + { + EXTERNAL_ENTITY_LOADER_FUNC = newSVsv(loader); + } + + if (LibXML_old_ext_ent_loader == NULL ) + { + LibXML_old_ext_ent_loader = xmlGetExternalEntityLoader(); + xmlSetExternalEntityLoader((xmlExternalEntityLoader)LibXML_load_external_entity); + } + } + OUTPUT: + RETVAL + MODULE = XML::LibXML PACKAGE = XML::LibXML::HashTable xmlHashTablePtr @@ -9401,4 +9441,3 @@ #endif OUTPUT: RETVAL - diff -urN XML-LibXML-1.75/lib/XML/LibXML/Parser.pod XML-LibXML-1.75-new/lib/XML/LibXML/Parser.pod --- XML-LibXML-1.75/lib/XML/LibXML/Parser.pod 2011-06-24 18:57:22.000000000 +0200 +++ XML-LibXML-1.75-new/lib/XML/LibXML/Parser.pod 2011-06-29 15:18:26.000000000 +0200 @@ -71,6 +71,11 @@ $parser->load_catalog( $catalog_file ); + # Global external entity loader (similar to ext_ent_handler option + # but this works really globally, also in XML::LibXSLT include etc..) + + XML::LibXML::externalEntityLoader(\&my_loader); + =head1 PARSING A XML document is read into a data structure such as a DOM tree by a piece of diff -urN XML-LibXML-1.75/t/49global_extent.t XML-LibXML-1.75-new/t/49global_extent.t --- XML-LibXML-1.75/t/49global_extent.t 1970-01-01 01:00:00.000000000 +0100 +++ XML-LibXML-1.75-new/t/49global_extent.t 2011-06-29 15:26:01.000000000 +0200 @@ -0,0 +1,51 @@ +# Test file created outside of h2xs framework. +# Run this like so: `perl 49global_extent.t' +# samuel(_dot_)behan(-at-)dob(_dot_)sk 2011/06/29 15:18:43 + +######################### + +# change 'tests => 1' to 'tests => last_test_to_print'; + +use Test::More tests => 1; + +use warnings; +use strict; +use XML::LibXML; +$|=1; + +if (20627 > XML::LibXML::LIBXML_VERSION) { + skip("skipping for libxml2 < 2.6.27") for 1..7; +} else { + +# global entity loader +XML::LibXML::externalEntityLoader(\&handler); + +my $parser = XML::LibXML->new({ + expand_entities => 1, +}); + +sub handler { + return "ENTITY:" . join(",",@_); +} + +my $xml = <<'EOF'; +<?xml version="1.0"?> +<!DOCTYPE foo [ +<!ENTITY a PUBLIC "//foo/bar/b" "file:/dev/null"> +<!ENTITY b SYSTEM "file:///dev/null"> +]> +<root> + <a>&a;</a> + <b>&b;</b> +</root> +EOF +my $xml_out = $xml; +$xml_out =~ s{&a;}{ENTITY:file:/dev/null,//foo/bar/b}; +$xml_out =~ s{&b;}{ENTITY:file:///dev/null,}; + +my $doc = $parser->parse_string($xml); + +# TEST +ok( $doc->toString() eq $xml_out ); + +} \ No newline at end of file