2 files changed, 22 insertions, 4 deletions

diff --git a/lua-cjson-1.0devel-1.rockspec b/lua-cjson-1.0devel-1.rockspec
index fa20c53..9ef9f2c 100644
--- a/lua-cjson-1.0devel-1.rockspec
+++ b/lua-cjson-1.0devel-1.rockspec
@@ -25,15 +25,18 @@ build = {
         cjson = {
             sources = { "lua_cjson.c", "strbuf.c", "fpconv.c" },
             defines = {
--- Optional workaround:
--- USE_INTERNAL_ISINF:  Provide internal isinf() implementation. Required
---                      on some Solaris platforms.
 -- LuaRocks does not support platform specific configuration for Solaris.
--- Uncomment the line below on Solaris platforms.
+-- Uncomment the line below on Solaris platforms if required.
 --                "USE_INTERNAL_ISINF"
             }
         }
     },
+    -- Override default build options (per platform)
+    platforms = {
+        win32 = { modules = { cjson = { defines = {
+            "DISABLE_INVALID_NUMBERS"
+        } } } }
+    },
     copy_directories = { "tests" }
 }
 
diff --git a/lua_cjson.c b/lua_cjson.c
index 175433a..ca85156 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -67,6 +67,11 @@
 #define DEFAULT_ENCODE_KEEP_BUFFER 1
 #define DEFAULT_ENCODE_NUMBER_PRECISION 14
 
+#ifdef DISABLE_INVALID_NUMBERS
+#undef DEFAULT_DECODE_REFUSE_BADNUM
+#define DEFAULT_DECODE_REFUSE_BADNUM 1
+#endif
+
 typedef enum {
     T_OBJ_BEGIN,
     T_OBJ_END,
@@ -341,6 +346,16 @@ static int json_cfg_refuse_invalid_numbers(lua_State *l)
                      &cfg->encode_refuse_badnum,
                      &cfg->decode_refuse_badnum);
 
+#if DISABLE_INVALID_NUMBERS
+    /* Some non-POSIX platforms don't handle double <-> string translations
+     * for Infinity/NaN/hexadecimal properly. Throw an error if the
+     * user attempts to enable them. */
+    if (!cfg->encode_refuse_badnum || !cfg->decode_refuse_badnum) {
+        cfg->encode_refuse_badnum = cfg->decode_refuse_badnum = 1;
+        luaL_error(l, "Infinity, NaN, and/or hexadecimal numbers are not supported.");
+    }
+#endif
+
     return 1;
 }