Corrected error cases in module creation

bioidiap · Dec 3, 2015 · 853ddde · 853ddde
1 parent c421bdb
commit 853ddde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bob/io/matlab/main.cpp b/bob/io/matlab/main.cpp
@@ -168,11 +168,13 @@ static PyObject* create_module (void) {
 
 # if PY_VERSION_HEX >= 0x03000000
   PyObject* m = PyModule_Create(&module_definition);
+  auto m_ = make_xsafe(m);
+  const char* ret = "O";
 # else
   PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
+  const char* ret = "N";
 # endif
   if (!m) return 0;
-  auto m_ = make_safe(m);
 
   /* imports dependencies */
   if (import_bob_blitz() < 0) return 0;
@@ -185,7 +187,7 @@ static PyObject* create_module (void) {
     //do not return 0, or we may crash badly
   }
 
-  return Py_BuildValue("O", m);
+  return Py_BuildValue(ret, m);
 }
 
 PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {

diff --git a/bob/io/matlab/version.cpp b/bob/io/matlab/version.cpp
@@ -65,17 +65,19 @@ static PyObject* create_module (void) {
 
 # if PY_VERSION_HEX >= 0x03000000
   PyObject* m = PyModule_Create(&module_definition);
+  auto m_ = make_xsafe(m);
+  const char* ret = "O";
 # else
   PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
+  const char* ret = "N";
 # endif
   if (!m) return 0;
-  auto m_ = make_safe(m); ///< protects against early returns
 
   /* register version numbers and constants */
   if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) return 0;
   if (PyModule_AddObject(m, "externals", build_version_dictionary()) < 0) return 0;
 
-  return Py_BuildValue("O", m);
+  return Py_BuildValue(ret, m);
 }
 
 PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {