fix crash caused by invalid number being set as property value

mixpanel · Jun 21, 2021 · 6caf099 · 6caf099
1 parent c16d1a7
commit 6caf099
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/android/src/main/java/com/mixpanel/reactnative/ReactNativeHelper.java b/android/src/main/java/com/mixpanel/reactnative/ReactNativeHelper.java
@@ -41,7 +41,12 @@ public static JSONObject reactToJSON(ReadableMap value) throws JSONException {
                 properties.put(key, value.getBoolean(key));
                 break;
             case Number:
-                properties.put(key, value.getDouble(key));
+                double numberValue = value.getDouble(key);
+                if (!Double.isNaN(numberValue) && !Double.isInfinite(numberValue)) {
+                    properties.put(key, numberValue);
+                } else {
+                    properties.put(key, String.valueOf(numberValue));
+                }
                 break;
             case String:
                 properties.put(key, value.getString(key));
@@ -77,7 +82,10 @@ public static JSONArray reactToJSON(ReadableArray value) throws JSONException {
                 properties.put(value.getBoolean(i));
                 break;
             case Number:
-                properties.put(value.getDouble(i));
+                double numberValue = value.getDouble(i);
+                if (!Double.isNaN(numberValue) && !Double.isInfinite(numberValue)) {
+                    properties.put(numberValue);
+                }
                 break;
             case String:
                 properties.put(value.getString(i));
@@ -133,7 +141,12 @@ public static Map<String, Object> toMap(ReadableMap value) {
                 mapProperties.put(key, value.getBoolean(key));
                 break;
             case Number:
-                mapProperties.put(key, value.getDouble(key));
+                double numberValue = value.getDouble(key);
+                if (!Double.isNaN(numberValue) && !Double.isInfinite(numberValue)) {
+                    mapProperties.put(key, value.getDouble(key));
+                } else {
+                    mapProperties.put(key, String.valueOf(numberValue));
+                }
                 break;
             case String:
                 mapProperties.put(key, value.getString(key));