summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2017-05-21 20:50:45 +1000
committerdaurnimator <quae@daurnimator.com>2017-05-21 20:56:50 +1000
commit02b6ac31f190d9423f68fa94d0dfabd34e32600a (patch)
treeca110fab78884265b94cd8b6f0969e9f458c983c /src
parentb0d9825d459eca0211947330d93dd7454b4ff5b0 (diff)
downloadfengari-02b6ac31f190d9423f68fa94d0dfabd34e32600a.tar.gz
fengari-02b6ac31f190d9423f68fa94d0dfabd34e32600a.tar.bz2
fengari-02b6ac31f190d9423f68fa94d0dfabd34e32600a.zip
src/lobject.js: parseFloat ignores trailing junk, validate with regex first
Diffstat (limited to 'src')
-rw-r--r--src/lobject.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lobject.js b/src/lobject.js
index 18876a9..4e0fa6f 100644
--- a/src/lobject.js
+++ b/src/lobject.js
@@ -350,9 +350,17 @@ const lua_strx2number = function(s) {
return s.length === 0 ? luaconf.ldexp(r, e) : null; /* Only valid if nothing left is s*/
};
+const lua_str2number = function(s) {
+ /* parseFloat ignores trailing junk, validate with regex first */
+ let str = defs.to_jsstring(s);
+ if (!/^[\t\v\f \n\r]*[\+\-]?([0-9]+\.?[0-9]*|\.[0-9]*)([eE][\+\-]?[0-9]+)?[\t\v\f \n\r]*$/.test(str))
+ return null;
+ let flt = parseFloat(str);
+ return !isNaN(flt) ? flt : null;
+};
+
const l_str2dloc = function(s, mode) {
- let flt = mode === 'x' ? lua_strx2number(s) : parseFloat(defs.to_jsstring(s));
- return !isNaN(flt) ? flt : null; /* OK if no trailing characters */
+ return mode === 'x' ? lua_strx2number(s) : lua_str2number(s);
};
const l_str2d = function(s) {