Upgrade to v0.3.2

Fixed fallback loads function what parsed negative integer from non negative
Fixed C big integer packing issue.

Author: iFA88

benchmark/__main__.py

@@ -52,10 +52,12 @@ def startBatch(i:int, data:Any, counter:int) -> None:
 				32,
 			)
 	print("")
-	
-data = deepcopy(pickle.loads(zlib.decompress(open("{}/testData1.dat".format(dirname(__file__)), 'rb').read())))
+
+with open("{}/testData1.dat".format(dirname(__file__)), 'rb') as fid:
+	data = deepcopy(pickle.loads(zlib.decompress(fid.read())))
 startBatch(1, data, 1)
-data = deepcopy(pickle.loads(zlib.decompress(open("{}/testData2.dat".format(dirname(__file__)), 'rb').read())))
+with open("{}/testData2.dat".format(dirname(__file__)), 'rb') as fid:
+	data = deepcopy(pickle.loads(zlib.decompress(fid.read())))
 startBatch(2, data, 1)
 data = deepcopy([data, {"data":(data, data)}])
 startBatch(3, data, 1)

fsPacker/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __doc__ = """
 FS Message Packer v{}
 Copyright (C) 2021 Fusion Solutions KFT <contact@fusionsolutions.io>

fsPacker/_fspacker.cpp

@@ -877,15 +877,11 @@ static int _fspacker_packer_ver2_int(packerObject_ver2 *self, PyObject *obj) {
 		return _fspacker_buffer_append(self->output, &VER2_OP_ZERO_INTERGER, 1);
 	}
 	int isNeg = sign<0;
-	Py_ssize_t nbits = _PyLong_NumBits(obj);
-	Py_ssize_t nbytes = (nbits >> 3)+1;
-	if (nbytes > ITEM_LIMIT) {
-		PyErr_SetString(self->module->PackingError, "Too big integer to pack");
-		return -1;
-	}
 	PyObject *absVal = NULL;
 	unsigned char *pdata = NULL;
 	PyObject *repr = NULL;
+	Py_ssize_t nbits = 0;
+	Py_ssize_t nbytes = 0;
 	switch (_fspacker_packer_ver2_register(self, obj)) {
 		case 1:
 			goto done;
@@ -894,17 +890,44 @@ static int _fspacker_packer_ver2_int(packerObject_ver2 *self, PyObject *obj) {
 		case -1:
 			return -1;
 	}
-	repr = PyBytes_FromStringAndSize(NULL, nbytes);
-	if (repr == NULL) {
-		goto memoryError;
-	}
-	pdata = (unsigned char *)PyBytes_AS_STRING(repr);
-	Py_DECREF(repr);
-	absVal = isNeg ? PyNumber_Absolute(obj):NULL;
-	if (_PyLong_AsByteArray((PyLongObject *)(absVal != NULL ? absVal:obj), pdata, nbytes, 1, 0) < 0) {
-		goto memoryError;
+	if ( isNeg ) {
+		absVal = PyNumber_Absolute(obj);
+		if ( absVal == NULL ) {
+			goto memoryError;
+		}
+		nbits = _PyLong_NumBits(absVal);
+		nbytes = (nbits >> 3)+1;
+		if (nbytes > ITEM_LIMIT) {
+			PyErr_SetString(self->module->PackingError, "Too big integer to pack");
+			goto error;
+		}
+		repr = PyBytes_FromStringAndSize(NULL, nbytes);
+		if (repr == NULL) {
+			goto memoryError;
+		}
+		pdata = (unsigned char *)PyBytes_AS_STRING(repr);
+		Py_DECREF(repr);
+		if (_PyLong_AsByteArray((PyLongObject *)(absVal), pdata, nbytes, 1, 0) < 0) {
+			goto memoryError;
+		}
+		Py_DECREF(absVal);
+	} else {
+		nbits = _PyLong_NumBits(obj);
+		nbytes = (nbits >> 3)+1;
+		if (nbytes > ITEM_LIMIT) {
+			PyErr_SetString(self->module->PackingError, "Too big integer to pack");
+			goto error;
+		}
+		repr = PyBytes_FromStringAndSize(NULL, nbytes);
+		if (repr == NULL) {
+			goto memoryError;
+		}
+		pdata = (unsigned char *)PyBytes_AS_STRING(repr);
+		Py_DECREF(repr);
+		if (_PyLong_AsByteArray((PyLongObject *)(obj), pdata, nbytes, 1, 0) < 0) {
+			goto memoryError;
+		}
 	}
-	Py_XDECREF(absVal);
 	if ((nbytes*8)-nbits >= 8 ) {
 		nbytes -= 1;
 	}

fsPacker/fallback.py

@@ -257,7 +257,7 @@ def _parse(self) -> Any:
 		elif op == self.OP_NEG_CHAR_INTERGER:
 			r = -int.from_bytes(self._read(1), "little")
 		elif op == self.OP_SHORT_INTERGER:
-			r = -int.from_bytes(self._read(2), "little")
+			r = int.from_bytes(self._read(2), "little")
 		elif op == self.OP_NEG_SHORT_INTERGER:
 			r = -int.from_bytes(self._read(2), "little")
 		elif op == self.OP_INTERGER:

fsPacker/test/fsPacker.py

@@ -24,6 +24,7 @@ class FSPackerTest(unittest.TestCase):
 		-1,
 		1,
 		1<<256,
+		-(1<<256),
 		0.0,
 		0.1,
 		-0.1,
@@ -43,8 +44,8 @@ class FSPackerTest(unittest.TestCase):
 		tuple(),
 		dict(),
 		{"data":"ok"},
-		{1:1},
-		{(1,2,3):1},
+		{None:0, 0:3, -1:4, 1:5, 255:6, -255:7, 0xFFFFFF:8, -0xFFFFFF:9, (1,2):10, 0.1:11, -0.1:12, float("inf"):13, \
+		float("-inf"):14, "":15, "a":16, b"":17, b"a":18 },
 		set(),
 		set([1, "a", "test", "b", b"\x00"]),
 		"F"*65000,

setup.py

@@ -38,7 +38,7 @@
 
 setup(
 	name                          = "python-fspacker",
-	version                       = "0.3.1",
+	version                       = "0.3.2",
 	description                   = "Fusion Solutions message packer",
 	keywords                      = "message pack packer utility fusion solutions fusionsolutions",
 	author                        = "Andor `iFA` Rajci - Fusions Solutions KFT",
@@ -63,4 +63,4 @@
 		"Programming Language :: Python :: 3.10",
 		"License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
 	],
-)
+)