1 files changed, 10 insertions, 0 deletions
diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c
index 636d26b24b..c167fd1f78 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.c
+++ b/lib/erl_interface/src/legacy/erl_eterm.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <math.h>
 
 #include "ei_locking.h"
 #include "ei_resolve.h"
@@ -125,6 +126,15 @@ ETERM *erl_mk_float (double d)
 {
     ETERM *ep;
 
+    /* Erlang does not handle Inf and NaN, so we return an error
+     * rather than letting the Erlang VM complain about a bad external
+     * term. */
+    switch(fpclassify(d)) {
+        case FP_NAN:
+        case FP_INFINITE:
+            return NULL;
+    }
+
     ep = erl_alloc_eterm(ERL_FLOAT);
     ERL_COUNT(ep) = 1;
     ERL_FLOAT_VALUE(ep) = d;