Merge pull request #13 from static-frame/12/win-access-violation

Windows fatal exception: access violation

Author: flexatone

arraymap.c

@@ -1239,7 +1239,12 @@ insert_int(
         return -1;
     }
     if (self->table[table_pos].hash != -1) {
-        PyErr_SetObject(NonUniqueError, PyLong_FromSsize_t(key));
+        PyObject* er = PyLong_FromLongLong(key); // for error reporting
+        if (er == NULL) {
+            return -1;
+        }
+        PyErr_SetObject(NonUniqueError, er);
+        Py_DECREF(er);
         return -1;
     }
     self->table[table_pos].keys_pos = keys_pos;
@@ -1264,7 +1269,12 @@ insert_uint(
         return -1;
     }
     if (self->table[table_pos].hash != -1) {
-        PyErr_SetObject(NonUniqueError, PyLong_FromSsize_t(key));
+        PyObject* er = PyLong_FromUnsignedLongLong(key);
+        if (er == NULL) {
+            return -1;
+        }
+        PyErr_SetObject(NonUniqueError, er);
+        Py_DECREF(er);
         return -1;
     }
     self->table[table_pos].keys_pos = keys_pos;
@@ -1290,7 +1300,12 @@ insert_double(
         return -1;
     }
     if (self->table[table_pos].hash != -1) {
-        PyErr_SetObject(NonUniqueError, PyFloat_FromDouble(key));
+        PyObject* er = PyFloat_FromDouble(key);
+        if (er == NULL) {
+            return -1;
+        }
+        PyErr_SetObject(NonUniqueError, er);
+        Py_DECREF(er);
         return -1;
     }
     self->table[table_pos].keys_pos = keys_pos;
@@ -1316,8 +1331,12 @@ insert_unicode(
         return -1;
     }
     if (self->table[table_pos].hash != -1) {
-        PyErr_SetObject(NonUniqueError,
-            PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, key, key_size));
+        PyObject* er = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, key, key_size);
+        if (er == NULL) {
+            return -1;
+        }
+        PyErr_SetObject(NonUniqueError, er);
+        Py_DECREF(er);
         return -1;
     }
     self->table[table_pos].keys_pos = keys_pos;
@@ -1343,8 +1362,12 @@ insert_string(
         return -1;
     }
     if (self->table[table_pos].hash != -1) {
-        PyErr_SetObject(NonUniqueError,
-            PyBytes_FromStringAndSize(key, key_size));
+        PyObject* er = PyBytes_FromStringAndSize(key, key_size);
+        if (er == NULL) {
+            return -1;
+        }
+        PyErr_SetObject(NonUniqueError, er);
+        Py_DECREF(er);
         return -1;
     }
     self->table[table_pos].keys_pos = keys_pos;
@@ -1947,6 +1970,7 @@ fam_init(PyObject *self, PyObject *args, PyObject *kwargs)
     }
     return 0;
 error:
+    // assume all dynamic memory assigned to struct attrs that will be cleaned
     return -1;
 }
 

test/test_unit.py

@@ -92,6 +92,23 @@ def test_fam_constructor_array_int_d():
         assert k in fam
 
 
+def test_fam_constructor_array_int_e():
+    # https://github.com/static-frame/arraymap/issues/12
+    a1 = np.array((0, 0, 1, 1, 2, 2), dtype=int)
+    a2 = a1[[0, 2, 4]]
+    a2.flags.writeable = False
+    fam1 = FrozenAutoMap(a2)
+    assert list(fam1) == [0, 1, 2]
+
+    d1 = {i: int(i) for i in a2}
+    fam2 = FrozenAutoMap(d1)
+    assert list(fam2) == [0, 1, 2]
+
+    d2 = {0: 0, 3: 1}
+    fam3 = FrozenAutoMap(d2)
+    assert list(fam3) == [0, 3]
+
+
 # ------------------------------------------------------------------------------