add more test_long

Author: lukasstadler

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_long.py

@@ -360,21 +360,27 @@ def compile_module(self, name):
             (-9223372036854775808, 8, False, True, b'\x80\x00\x00\x00\x00\x00\x00\x00'),
             (9223372036854775807, 9, False, True, b'\x00\x7f\xff\xff\xff\xff\xff\xff\xff'),
             (-9223372036854775808, 9, False, True, b'\xff\x80\x00\x00\x00\x00\x00\x00\x00'),
+            (12, 8, False, True, b'\x00\x00\x00\x00\x00\x00\x00\x0c'),
             (1234, 8, False, True, b'\x00\x00\x00\x00\x00\x00\x04\xd2'),
             (0xdeadbeefdead, 8, False, True, b'\x00\x00\xde\xad\xbe\xef\xde\xad'),
             (0xdeadbeefdead, 8, True, True, b'\xad\xde\xef\xbe\xad\xde\x00\x00'),
+            (0xdeadbeefdead, 7, True, True, b'\xad\xde\xef\xbe\xad\xde\x00'),
             (0xdeadbeefdeadbeefbeefdeadcafebabe, 17, False, True, b'\x00\xde\xad\xbe\xef\xde\xad\xbe\xef\xbe\xef\xde\xad\xca\xfe\xba\xbe'),
         ),
         code='''PyObject* wrap_PyLong_AsByteArray(PyObject* object, Py_ssize_t n, int little_endian, int is_signed, PyObject* unused) {
-            unsigned char* buf = (unsigned char *) malloc(n * sizeof(unsigned char));
+            unsigned char* buf = (unsigned char *) malloc(n * sizeof(unsigned char) + 1);
+            memset(buf, 0x33, n + 1);
             PyObject* result;
-            
             Py_INCREF(object);
             if (_PyLong_AsByteArray((PyLongObject*) object, buf, n, little_endian, is_signed)) {
                 Py_DECREF(object);
                 return NULL;
             }
             Py_DECREF(object);
+            if (buf[n] != 0x33) {
+                PyErr_SetString(PyExc_SystemError, "Sentinel value corrupted.");
+                return NULL;
+            }
             result = PyBytes_FromStringAndSize((const char *) buf, n);
             free(buf);
             return result;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextLongBuiltins.java

@@ -414,16 +414,21 @@ static int run() {
 
     @CApiBuiltin(ret = Int, args = {PyLongObject, UNSIGNED_CHAR_PTR, SIZE_T, Int, Int}, call = Direct)
     abstract static class _PyLong_AsByteArray extends CApi5BuiltinNode {
+        private static void checkSign(boolean negative, int isSigned, PRaiseNode raise) {
+            if (negative) {
+                if (isSigned == 0) {
+                    throw raise.raise(OverflowError, ErrorMessages.MESSAGE_CONVERT_NEGATIVE);
+                }
+            }
+        }
+
         @Specialization
         static Object get(int value, Object bytes, long n, int littleEndian, int isSigned,
                         @Bind("this") Node inliningTarget,
                         @Shared @Cached InlinedConditionProfile profile,
                         @Shared @Cached PRaiseNode raise,
                         @Shared @Cached CStructAccess.WriteByteNode write) {
-            if (isSigned == 0 && value < 0) {
-                throw raise.raise(OverflowError, ErrorMessages.MESSAGE_CONVERT_NEGATIVE);
-            }
-
+            checkSign(value < 0, isSigned, raise);
             byte[] array = IntBuiltins.ToBytesNode.fromLong(value, PythonUtils.toIntError(n), littleEndian == 0, isSigned != 0, inliningTarget, profile, raise);
             write.writeByteArray(bytes, array);
             return 0;
@@ -435,10 +440,7 @@ static Object get(long value, Object bytes, long n, int littleEndian, int isSign
                         @Shared @Cached InlinedConditionProfile profile,
                         @Shared @Cached PRaiseNode raise,
                         @Shared @Cached CStructAccess.WriteByteNode write) {
-            if (isSigned == 0 && value < 0) {
-                throw raise.raise(OverflowError, ErrorMessages.MESSAGE_CONVERT_NEGATIVE);
-            }
-
+            checkSign(value < 0, isSigned, raise);
             byte[] array = IntBuiltins.ToBytesNode.fromLong(value, PythonUtils.toIntError(n), littleEndian == 0, isSigned != 0, inliningTarget, profile, raise);
             write.writeByteArray(bytes, array);
             return 0;
@@ -450,10 +452,7 @@ static Object get(PInt value, Object bytes, long n, int littleEndian, int isSign
                         @Shared @Cached InlinedConditionProfile profile,
                         @Shared @Cached PRaiseNode raise,
                         @Shared @Cached CStructAccess.WriteByteNode write) {
-            if (isSigned == 0 && value.isNegative()) {
-                throw raise.raise(OverflowError, ErrorMessages.MESSAGE_CONVERT_NEGATIVE);
-            }
-
+            checkSign(value.isNegative(), isSigned, raise);
             byte[] array = IntBuiltins.ToBytesNode.fromBigInteger(value, PythonUtils.toIntError(n), littleEndian == 0, isSigned != 0, inliningTarget, profile, raise);
             write.writeByteArray(bytes, array);
             return 0;