Fix segfault if load key from binary fails

bgaifullin · bgaifullin · commit 01b1f024ed85 · 2017-07-21T01:04:46.000+01:00
diff --git a/src/keys.c b/src/keys.c
@@ -253,7 +253,7 @@ static PyObject* PyXmlSec_KeyFromBinaryFile(PyObject* self, PyObject* args, PyOb
 ON_FAIL:
     PYXMLSEC_DEBUG("load symmetric key - fail");
     Py_XDECREF(key);
-    Py_DECREF(filepath);
+    Py_XDECREF(filepath);
     return NULL;
 }
 
diff --git a/tests/test_keys.py b/tests/test_keys.py
@@ -13,10 +13,18 @@ def test_key_from_memory(self):
         key = xmlsec.Key.from_memory(self.load("rsakey.pem"), format=consts.KeyDataFormatPem)
         self.assertIsNotNone(key)
 
+    def test_key_from_memory_with_bad_args(self):
+        with self.assertRaises(TypeError):
+            xmlsec.Key.from_memory(1, format="")
+
     def test_key_from_file(self):
         key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
         self.assertIsNotNone(key)
 
+    def test_key_from_file_with_bad_args(self):
+        with self.assertRaises(TypeError):
+            xmlsec.Key.from_file(1, format="")
+
     def test_key_from_fileobj(self):
         with open(self.path("rsakey.pem"), "rb") as fobj:
             key = xmlsec.Key.from_file(fobj, format=consts.KeyDataFormatPem)
@@ -26,15 +34,29 @@ def test_generate(self):
         key = xmlsec.Key.generate(klass=consts.KeyDataAes, size=256, type=consts.KeyDataTypeSession)
         self.assertIsNotNone(key)
 
+    def test_generate_with_bad_args(self):
+        with self.assertRaises(TypeError):
+            xmlsec.Key.generate(klass="", size="", type="")
+
     def test_from_binary_file(self):
         key = xmlsec.Key.from_binary_file(klass=consts.KeyDataDes, filename=self.path("deskey.bin"))
         self.assertIsNotNone(key)
 
+    def test_from_binary_file_with_bad_args(self):
+        with self.assertRaises(TypeError):
+            xmlsec.Key.from_binary_file(klass="", filename=1)
+
     def test_load_cert_from_file(self):
         key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
         self.assertIsNotNone(key)
         key.load_cert_from_file(self.path("rsacert.pem"), format=consts.KeyDataFormatPem)
 
+    def test_load_cert_from_file_with_bad_args(self):
+        key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
+        self.assertIsNotNone(key)
+        with self.assertRaises(TypeError):
+            key.load_cert_from_file(1, format="")
+
     def test_load_cert_from_fileobj(self):
         key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
         self.assertIsNotNone(key)
@@ -46,8 +68,15 @@ def test_load_cert_from_memory(self):
         self.assertIsNotNone(key)
         key.load_cert_from_memory(self.load("rsacert.pem"), format=consts.KeyDataFormatPem)
 
+    def test_load_cert_from_memory_with_bad_args(self):
+        key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
+        self.assertIsNotNone(key)
+        with self.assertRaises(TypeError):
+            key.load_cert_from_memory(1, format="")
+
     def test_name(self):
         key = xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem)
+        self.assertIsNone(key.name)
         key.name = "rsakey"
         self.assertEqual("rsakey", key.name)
 
@@ -64,16 +93,33 @@ def test_add_key(self):
         mngr = xmlsec.KeysManager()
         mngr.add_key(key)
 
+    def test_add_key_with_bad_args(self):
+        mngr = xmlsec.KeysManager()
+        with self.assertRaises(TypeError):
+            mngr.add_key("")
+
     def test_load_cert(self):
         mngr = xmlsec.KeysManager()
         mngr.add_key(xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem))
         mngr.load_cert(self.path("rsacert.pem"), format=consts.KeyDataFormatPem, type=consts.KeyDataTypeTrusted)
 
+    def test_load_cert_with_bad_args(self):
+        mngr = xmlsec.KeysManager()
+        mngr.add_key(xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem))
+        with self.assertRaises(TypeError):
+            mngr.load_cert(1, format="", type="")
+
     def test_load_cert_from_memory(self):
         mngr = xmlsec.KeysManager()
         mngr.add_key(xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem))
         mngr.load_cert_from_memory(self.load("rsacert.pem"), format=consts.KeyDataFormatPem, type=consts.KeyDataTypeTrusted)
 
+    def test_load_cert_from_memory_with_bad_args(self):
+        mngr = xmlsec.KeysManager()
+        mngr.add_key(xmlsec.Key.from_file(self.path("rsakey.pem"), format=consts.KeyDataFormatPem))
+        with self.assertRaises(TypeError):
+            mngr.load_cert_from_memory(1, format="", type="")
+
     def test_load_invalid_key(self):
         mngr = xmlsec.KeysManager()
         with self.assertRaises(ValueError):

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ static PyObject* PyXmlSec_KeyFromBinaryFile(PyObject* self, PyObject* args, PyOb`
`253`	`253`	`ON_FAIL:`
`254`	`254`	`PYXMLSEC_DEBUG("load symmetric key - fail");`
`255`	`255`	`Py_XDECREF(key);`
`256`		`- Py_DECREF(filepath);`
	`256`	`+ Py_XDECREF(filepath);`
`257`	`257`	`return NULL;`
`258`	`258`	`}`
`259`	`259`