Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 26 additions & 10 deletions Parser.pm
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,13 @@ sub parse_start {
my $expatnb = XML::Parser::ExpatNB->new( @expat_options, @_ );
$expatnb->setHandlers(%handlers);

&$init($expatnb)
if defined($init);
if (defined($init)) {
eval { &$init($expatnb) };
if ($@) {
$expatnb->release;
die $@;
}
}

$expatnb->{_State_} = 1;

Expand Down Expand Up @@ -177,8 +182,13 @@ sub parse {
$expat->base( $self->{Base} );
}

&$init($expat)
if defined($init);
if (defined($init)) {
eval { &$init($expat) };
if ($@) {
$expat->release;
die $@;
}
}

my @result = ();
my $result;
Expand All @@ -190,16 +200,22 @@ sub parse {
}

if ( $result and defined($final) ) {
if (wantarray) {
@result = &$final($expat);
}
else {
$result = &$final($expat);
}
my $want = wantarray;
eval {
if ($want) {
@result = &$final($expat);
}
else {
$result = &$final($expat);
}
};
$err = $@;
}

$expat->release;

die $err if $err;

return unless defined wantarray;
return wantarray ? @result : $result;
}
Expand Down
48 changes: 48 additions & 0 deletions t/parser_api.t
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,52 @@ my $simple_xml = '<root><child>text</child></root>';
is($p->{Base}, 'saved_base', 'parsefile restores Base even after error');
}

# --- Init handler die releases parser (no circular ref leak) ---
{
my $released = 0;
my $p = XML::Parser->new(
Handlers => {
Init => sub { die "init failed\n" },
},
);
eval { $p->parse('<root/>') };
like($@, qr/init failed/, 'Init handler die propagates correctly');
# Parser should still be usable after Init failure
my $ok = eval {
$p->setHandlers(Init => undef);
$p->parse('<root/>');
1;
};
ok($ok, 'Parser reusable after Init handler failure');
}

# --- Final handler die still releases parser ---
{
my $p = XML::Parser->new(
Handlers => {
Final => sub { die "final failed\n" },
},
);
eval { $p->parse('<root/>') };
like($@, qr/final failed/, 'Final handler die propagates correctly');
# Parser should still be usable
my $ok = eval {
$p->setHandlers(Final => undef);
$p->parse('<root/>');
1;
};
ok($ok, 'Parser reusable after Final handler failure');
}

# --- parse_start Init handler die releases parser ---
{
my $p = XML::Parser->new(
Handlers => {
Init => sub { die "init_nb failed\n" },
},
);
eval { $p->parse_start() };
like($@, qr/init_nb failed/, 'parse_start Init handler die propagates correctly');
}

done_testing;
Loading