diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-14 01:33:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 01:33:24 +0300 |
| commit | 1b1682ed243ef8304bfce1be7a70626c95720d93 (patch) | |
| tree | 7d59d93dca969c4f884218a9451f15f1833fc82c /tools | |
| parent | b75799528a1394919fd5eb4c8763a96ee80a9325 (diff) | |
| parent | 230de7dd1ec428c3a6274de3724cda284dea33e6 (diff) | |
| download | hercules-1b1682ed243ef8304bfce1be7a70626c95720d93.tar.gz hercules-1b1682ed243ef8304bfce1be7a70626c95720d93.tar.bz2 hercules-1b1682ed243ef8304bfce1be7a70626c95720d93.tar.xz hercules-1b1682ed243ef8304bfce1be7a70626c95720d93.zip | |
Merge pull request #1477 from HerculesWS/memmgr-hpm-fixes
Fixed a memory manager crash when a memory leak occurs in a plugin
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/HPMHookGen/HPMHookGen.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/HPMHookGen/HPMHookGen.pl b/tools/HPMHookGen/HPMHookGen.pl index 3203e0b70..b8835b376 100755 --- a/tools/HPMHookGen/HPMHookGen.pl +++ b/tools/HPMHookGen/HPMHookGen.pl @@ -295,6 +295,7 @@ foreach my $file (@files) { # Loop through the xml files my $loc = $data->{compounddef}->{$filekey}->{location}->[0]; next unless $loc->{file} =~ /src\/(map|char|login|common)\//; next if $loc->{file} =~ /\/HPM.*\.h/; # Don't allow hooking into the HPM itself + next if $loc->{file} =~ /\/memmgr\.h/; # Don't allow hooking into the memory manager my $servertype = $1; my $key = $data->{compounddef}->{$filekey}->{compoundname}->[0]; my $original = $key; @@ -338,8 +339,6 @@ foreach my $file (@files) { # Loop through the xml files $key = "chr"; } elsif ($key eq "db_interface") { $key = "DB"; - } elsif ($key eq "malloc_interface") { - $key = "iMalloc"; } elsif ($key eq "socket_interface") { $key = "sockt"; } elsif ($key eq "sql_interface") { |