aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-14 21:41:47 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-14 21:41:47 -0800
commit757f28b777303a90fe2992d0e2f82ce0958f12f2 (patch)
treee0245fc9f203a422e5ca04fa308e0ced075564df /src
parent4e21fffe3f824247dceba0af38d36996afad2c13 (diff)
don't evaluate function table aliases containing relocation offsets; fixes #1807
Diffstat (limited to 'src')
-rw-r--r--src/modules.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js
index 13cca977..673e0662 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -341,7 +341,7 @@ var Functions = {
// Resolve multi-level aliases all the way down
while (1) {
var varData = Variables.globals[table[i]];
- if (!(varData && varData.resolvedAlias && varData.resolvedAlias.indexOf('FUNCTION_TABLE_OFFSET') < 0)) break;
+ if (!(varData && varData.resolvedAlias && !/(FUNCTION_TABLE_OFFSET|F_BASE_)/.test(varData.resolvedAlias))) break;
table[i] = table[+varData.resolvedAlias || eval(varData.resolvedAlias)]; // might need to eval to turn (6) into 6
}
// Resolve library aliases