GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-25 04:02:37 +01:00
Code Issues Projects Releases Wiki Activity

Use proper lookbehind to prevent expansion of escaped variables

Browse Source 
Remove adlib recursion loop since using $action already enables
recursion since subsitution on $action resets the regex position
This commit is contained in:
Pragmatic Software 2015-04-03 13:06:24 -07:00
parent d2711956d6
commit d1341ab4bd
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PBot/Factoids.pm
View File

@ -481,10 +481,9 @@ sub interpreter {
$action =~ s/\$nick/$nick/g; $action =~ s/\$nick/$nick/g;
$action =~ s/\$channel/$from/g; $action =~ s/\$channel/$from/g;
my $adlib_recursion = 0; while ($action =~ /(?<!\\)\$([a-zA-Z0-9_\-]+)/g) {
while ($action =~ /[^\\]\$([a-zA-Z0-9_\-]+)/ and ++$adlib_recursion < 5) {
while ($action =~ /[^\\]\$([a-zA-Z0-9_\-]+)/g) {
my $v = $1; my $v = $1;
print "v = [$v]\n";
next if $v =~ m/^[0-9]+$/; next if $v =~ m/^[0-9]+$/;
my ($var_chan, $var) = $self->find_factoid($from, $v, undef, 0, 1); my ($var_chan, $var) = $self->find_factoid($from, $v, undef, 0, 1);
@ -502,7 +501,6 @@ sub interpreter {
$action =~ s/\$$var/$var/g; $action =~ s/\$$var/$var/g;
} }
} }
}
$action =~ s/\\\$/\$/g; $action =~ s/\\\$/\$/g;