Fix wrong init return value

dib-lab · Nov 4, 2016 · 240d970 · 240d970
1 parent c7fb26b
commit 240d970
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/khmer/_khmer.cc b/khmer/_khmer.cc
@@ -284,7 +284,12 @@ khmer_Read_new(PyTypeObject * type, PyObject * args, PyObject * kwds)
     khmer_Read_Object * self;
     self = (khmer_Read_Object *)type->tp_alloc(type, 0);
     if (self != NULL) {
-        self->read = new Read;
+        try {
+            self->read = new Read;
+        } catch (std::bad_alloc &exc) {
+            Py_DECREF(self);
+            return PyErr_NoMemory();
+        }
     }
     return (PyObject *)self;
 }
@@ -304,7 +309,7 @@ khmer_Read_init(khmer_Read_Object *self, PyObject *args, PyObject *kwds)
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss|zz", kwlist,
                                      &name, &sequence, &quality, &annotations)) {
-        return 0;
+        return -1;
     }
 
     if (name != NULL) {

diff --git a/tests/test_read_parsers.py b/tests/test_read_parsers.py
@@ -47,6 +47,10 @@
 
 def test_read_type_basic():
     # test that basic properties of khmer.Read behave like screed.Record
+    # Constructing without mandatory arguments should raise an exception
+    with pytest.raises(TypeError):
+        Read()
+
     name = "895:1:1:1246:14654 1:N:0:NNNNN"
     sequence = "ACGT"
     r = Read(name, sequence)