Skip to content

Commit

Permalink
Fix encoding of infinity (ultrajson#80).
Browse files Browse the repository at this point in the history 
Infinity was being encoded as 'Inf' which, whilst the JSON spec doesn't include
any non-finite floats, differs from the conventions in other JSON libraries,
JavaScript of using 'Infinity'. It also differs from what `ujson.loads()`
expects so that `ujson.loads(ujson.dumps(math.inf))` raises an exception.

Closes ultrajson#80.
  • Loading branch information
@bwoodsend
bwoodsend committed Aug 7, 2022
1 parent bcdc041 commit f7e3e01
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 68 deletions.
2 changes: 1 addition & 1 deletion python/objToJSON.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ PyObject* objToJSON(PyObject* self, PyObject *args, PyObject *kwargs)

if (encoder.allowNan)
{
csInf = "Inf";
csInf = "Infinity";
csNan = "NaN";
}

Expand Down
129 changes: 64 additions & 65 deletions python/ujson.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,66 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS INC. BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Portions of code from MODP_ASCII - Ascii transformations (upper/lower, etc)
http://code.google.com/p/stringencoders/
Copyright (c) 2007 Nick Galbreath -- nickg [at] modp [dot] com. All rights reserved.
Copyright (c) 2007 Nick Galbreath -- nickg [at] modp [dot] com. All rights
reserved.
Numeric decoder derived from from TCL library
http://www.opensource.apple.com/source/tcl/tcl-14/tcl/license.terms
* Copyright (c) 1988-1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*/

#include <Python.h>
#include "version.h"
#include "ujson.h"
#include "version.h"
#include <Python.h>

/* objToJSON */
PyObject* objToJSON(PyObject* self, PyObject *args, PyObject *kwargs);
PyObject *objToJSON(PyObject *self, PyObject *args, PyObject *kwargs);

/* JSONToObj */
PyObject* JSONToObj(PyObject* self, PyObject *args, PyObject *kwargs);
PyObject *JSONToObj(PyObject *self, PyObject *args, PyObject *kwargs);

/* objToJSONFile */
PyObject* objToJSONFile(PyObject* self, PyObject *args, PyObject *kwargs);
PyObject *objToJSONFile(PyObject *self, PyObject *args, PyObject *kwargs);

/* JSONFileToObj */
PyObject* JSONFileToObj(PyObject* self, PyObject *args, PyObject *kwargs);

PyObject* JSONDecodeError;
PyObject *JSONFileToObj(PyObject *self, PyObject *args, PyObject *kwargs);

PyObject *JSONDecodeError;

#define ENCODER_HELP_TEXT "Use ensure_ascii=false to output UTF-8. " \
"Set encode_html_chars=True to encode < > & as unicode escape sequences. "\
"Set escape_forward_slashes=False to prevent escaping / characters." \
"Set allow_nan=False to raise an exception when NaN or Inf would be serialized." \
"Set reject_bytes=True to raise TypeError on bytes."
#define ENCODER_HELP_TEXT \
"Use ensure_ascii=false to output UTF-8. " \
"Set encode_html_chars=True to encode < > & as unicode escape sequences. " \
"Set escape_forward_slashes=False to prevent escaping / characters." \
"Set allow_nan=False to raise an exception when NaN or Infinity would be " \
"serialized." \
"Set reject_bytes=True to raise TypeError on bytes."

static PyMethodDef ujsonMethods[] = {
{"encode", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursively into JSON. " ENCODER_HELP_TEXT},
{"decode", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as string to dict object structure."},
{"dumps", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursively into JSON. " ENCODER_HELP_TEXT},
{"loads", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as string to dict object structure."},
{"dump", (PyCFunction) objToJSONFile, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursively into JSON file. " ENCODER_HELP_TEXT},
{"load", (PyCFunction) JSONFileToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as file to dict object structure."},
{NULL, NULL, 0, NULL} /* Sentinel */
{"encode", (PyCFunction)objToJSON, METH_VARARGS | METH_KEYWORDS,
"Converts arbitrary object recursively into JSON. " ENCODER_HELP_TEXT},
{"decode", (PyCFunction)JSONToObj, METH_VARARGS | METH_KEYWORDS,
"Converts JSON as string to dict object structure."},
{"dumps", (PyCFunction)objToJSON, METH_VARARGS | METH_KEYWORDS,
"Converts arbitrary object recursively into JSON. " ENCODER_HELP_TEXT},
{"loads", (PyCFunction)JSONToObj, METH_VARARGS | METH_KEYWORDS,
"Converts JSON as string to dict object structure."},
{"dump", (PyCFunction)objToJSONFile, METH_VARARGS | METH_KEYWORDS,
"Converts arbitrary object recursively into JSON "
"file. " ENCODER_HELP_TEXT},
{"load", (PyCFunction)JSONFileToObj, METH_VARARGS | METH_KEYWORDS,
"Converts JSON as file to dict object structure."},
{NULL, NULL, 0, NULL} /* Sentinel */
};

typedef struct {
Expand All @@ -80,28 +89,29 @@ static int module_clear(PyObject *m);
static void module_free(void *m);

static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"ujson",
0, /* m_doc */
sizeof(modulestate), /* m_size */
ujsonMethods, /* m_methods */
NULL, /* m_slots */
module_traverse, /* m_traverse */
module_clear, /* m_clear */
module_free /* m_free */
PyModuleDef_HEAD_INIT,
"ujson",
0, /* m_doc */
sizeof(modulestate), /* m_size */
ujsonMethods, /* m_methods */
NULL, /* m_slots */
module_traverse, /* m_traverse */
module_clear, /* m_clear */
module_free /* m_free */
};

#define modulestate(o) ((modulestate *)PyModule_GetState(o))
#define modulestate_global modulestate(PyState_FindModule(&moduledef))

#ifndef PYPY_VERSION
/* Used in objToJSON.c */
int object_is_decimal_type(PyObject *obj)
{
int object_is_decimal_type(PyObject *obj) {
PyObject *module = PyState_FindModule(&moduledef);
if (module == NULL) return 0;
if (module == NULL)
return 0;
modulestate *state = modulestate(module);
if (state == NULL) return 0;
if (state == NULL)
return 0;
PyObject *type_decimal = state->type_decimal;
if (type_decimal == NULL) {
PyErr_Clear();
Expand All @@ -116,8 +126,7 @@ int object_is_decimal_type(PyObject *obj)
}
#else
/* Used in objToJSON.c */
int object_is_decimal_type(PyObject *obj)
{
int object_is_decimal_type(PyObject *obj) {
PyObject *module = PyImport_ImportModule("decimal");
if (module == NULL) {
PyErr_Clear();
Expand All @@ -140,61 +149,51 @@ int object_is_decimal_type(PyObject *obj)
}
#endif

static int module_traverse(PyObject *m, visitproc visit, void *arg)
{
static int module_traverse(PyObject *m, visitproc visit, void *arg) {
Py_VISIT(modulestate(m)->type_decimal);
return 0;
}

static int module_clear(PyObject *m)
{
static int module_clear(PyObject *m) {
Py_CLEAR(modulestate(m)->type_decimal);
return 0;
}

static void module_free(void *m)
{
module_clear((PyObject *)m);
}
static void module_free(void *m) { module_clear((PyObject *)m); }

PyMODINIT_FUNC PyInit_ujson(void)
{
PyObject* module;
PyMODINIT_FUNC PyInit_ujson(void) {
PyObject *module;

#ifndef PYPY_VERSION
// This function is not supported in PyPy.
if ((module = PyState_FindModule(&moduledef)) != NULL)
{
if ((module = PyState_FindModule(&moduledef)) != NULL) {
Py_INCREF(module);
return module;
}
#endif

module = PyModule_Create(&moduledef);
if (module == NULL)
{
if (module == NULL) {
return NULL;
}

PyModule_AddStringConstant(module, "__version__", UJSON_VERSION);

#ifndef PYPY_VERSION
PyObject *mod_decimal = PyImport_ImportModule("decimal");
if (mod_decimal)
{
PyObject* type_decimal = PyObject_GetAttrString(mod_decimal, "Decimal");
if (mod_decimal) {
PyObject *type_decimal = PyObject_GetAttrString(mod_decimal, "Decimal");
assert(type_decimal != NULL);
modulestate(module)->type_decimal = type_decimal;
Py_DECREF(mod_decimal);
}
else
} else
PyErr_Clear();
#endif

JSONDecodeError = PyErr_NewException("ujson.JSONDecodeError", PyExc_ValueError, NULL);
JSONDecodeError =
PyErr_NewException("ujson.JSONDecodeError", PyExc_ValueError, NULL);
Py_XINCREF(JSONDecodeError);
if (PyModule_AddObject(module, "JSONDecodeError", JSONDecodeError) < 0)
{
if (PyModule_AddObject(module, "JSONDecodeError", JSONDecodeError) < 0) {
Py_XDECREF(JSONDecodeError);
Py_CLEAR(JSONDecodeError);
Py_DECREF(module);
Expand Down
4 changes: 2 additions & 2 deletions tests/test_ujson.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,8 +842,8 @@ def test_encode_no_assert(test_input):
(1.0, "1.0"),
(OrderedDict([(1, 1), (0, 0), (8, 8), (2, 2)]), '{"1":1,"0":0,"8":8,"2":2}'),
({"a": float("NaN")}, '{"a":NaN}'),
({"a": float("inf")}, '{"a":Inf}'),
({"a": -float("inf")}, '{"a":-Inf}'),
({"a": float("inf")}, '{"a":Infinity}'),
({"a": -float("inf")}, '{"a":-Infinity}'),
],
)
def test_encode(test_input, expected):
Expand Down

0 comments on commit f7e3e01

Please sign in to comment.