Skip to content

Commit

Permalink
Fix misparsing of maketext strings.
Browse files Browse the repository at this point in the history
Case 61251: This commit fixes a misparse of maketext strings that could
lead to arbitrary code execution.  Basically, maketext was compiling
bracket notation into functions, but neglected to escape backslashes
inside the content or die on fully-qualified method names when
generating the code.  This change escapes all such backslashes and dies
when a method name with a colon or apostrophe is specified.
  • Loading branch information
Brian Carlson authored and rjbs committed Dec 4, 2012
1 parent 569ba91 commit 1735f6f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org>
Brent Dax <brentdax@cpan.org>
Brooks D Boyd
Brian Callaghan <callagh@itginc.com>
Brian Carlson <brian.carlson@cpanel.net>
Brian Clarke <clarke@appliedmeta.com>
brian d foy <brian.d.foy@gmail.com>
Brian Fraser <fraserbn@gmail.com>
Expand Down
24 changes: 8 additions & 16 deletions dist/Locale-Maketext/lib/Locale/Maketext.pm
Original file line number Diff line number Diff line change
Expand Up @@ -625,21 +625,9 @@ sub _compile {
# 0-length method name means to just interpolate:
push @code, ' (';
}
elsif($m =~ /^\w+(?:\:\:\w+)*$/s
and $m !~ m/(?:^|\:)\d/s
# exclude starting a (sub)package or symbol with a digit
elsif($m =~ /^\w+$/s
# exclude anything fancy, especially fully-qualified module names
) {
# Yes, it even supports the demented (and undocumented?)
# $obj->Foo::bar(...) syntax.
$target->_die_pointing(
$string_to_compile, q{Can't use "SUPER::" in a bracket-group method},
2 + length($c[-1])
)
if $m =~ m/^SUPER::/s;
# Because for SUPER:: to work, we'd have to compile this into
# the right package, and that seems just not worth the bother,
# unless someone convinces me otherwise.

push @code, ' $_[0]->' . $m . '(';
}
else {
Expand Down Expand Up @@ -693,7 +681,9 @@ sub _compile {
elsif(substr($1,0,1) ne '~') {
# it's stuff not containing "~" or "[" or "]"
# i.e., a literal blob
$c[-1] .= $1;
my $text = $1;
$text =~ s/\\/\\\\/g;
$c[-1] .= $text;

}
elsif($1 eq '~~') { # "~~"
Expand Down Expand Up @@ -731,7 +721,9 @@ sub _compile {
else {
# It's a "~X" where X is not a special character.
# Consider it a literal ~ and X.
$c[-1] .= $1;
my $text = $1;
$text =~ s/\\/\\\\/g;
$c[-1] .= $text;
}
}
}
Expand Down

0 comments on commit 1735f6f

Please sign in to comment.