From ec769d2d95d69f87436f1a2ef73bbe4c4c2f0b50 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 4 Dec 2009 02:56:25 +0100
Subject: [PATCH] jscript: Correctly handle NaN in to_integer.

---
 dlls/jscript/jsutils.c    | 8 ++++++--
 dlls/jscript/tests/api.js | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index 304980d77a..9e49cc7b8a 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -449,10 +449,14 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret)
     if(FAILED(hres))
         return hres;
 
-    if(V_VT(&num) == VT_I4)
+    if(V_VT(&num) == VT_I4) {
         *ret = num;
-    else
+    }else if(isnan(V_R8(&num))) {
+        V_VT(ret) = VT_I4;
+        V_I4(ret) = 0;
+    }else {
         num_set_val(ret, V_R8(&num) >= 0.0 ? floor(V_R8(&num)) : -floor(-V_R8(&num)));
+    }
 
     return S_OK;
 }
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 42a79e8f71..80bdf88b98 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -231,6 +231,8 @@ tmp = "abc".charAt(-1);
 ok(tmp === "", "'abc',charAt(-1) = " + tmp);
 tmp = "abc".charAt(0,2);
 ok(tmp === "a", "'abc',charAt(0.2) = " + tmp);
+tmp = "abc".charAt(NaN);
+ok(tmp === "a", "'abc',charAt(NaN) = " + tmp);
 
 tmp = "abc".charCodeAt(0);
 ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp);