Prevent NaN in jsonb/plpython transform

petere · petere · commit 40f52b16dd31 · 2018-05-02T16:01:22.000-04:00
As in e348e7a for jsonb/plperl, prevent putting a NaN into a jsonb numeric field. Tests for this had been removed in 6278a2a, but in case they are ever resurrected: This would change the output of the test1nan() function to an error.
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -5,6 +5,7 @@
 #include "plpy_typeio.h"
 #include "utils/jsonb.h"
 #include "utils/fmgrprotos.h"
+#include "utils/numeric.h"
 
 PG_MODULE_MAGIC;
 
@@ -343,6 +344,16 @@ PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
 
 	pfree(str);
 
+	/*
+	 * jsonb doesn't allow NaN (per JSON specification), so we have to prevent
+	 * it here explicitly.  (Infinity is also not allowed in jsonb, but
+	 * numeric_in above already catches that.)
+	 */
+	if (numeric_is_nan(num))
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 (errmsg("cannot convert NaN to jsonb"))));
+
 	jbvNum->type = jbvNumeric;
 	jbvNum->val.numeric = num;
 
