4 files changed, 24 insertions, 21 deletions

diff --git a/plugins/pychrysa/analysis/db/Makefile.am b/plugins/pychrysa/analysis/db/Makefile.am
index e33130f..2de2a16 100644
--- a/plugins/pychrysa/analysis/db/Makefile.am
+++ b/plugins/pychrysa/analysis/db/Makefile.am
@@ -6,7 +6,8 @@ libpychrysaanalysisdb_la_SOURCES =		\
 	item.h item.c						\
 	module.h module.c
 
-libpychrysaanalysisdb_la_LDFLAGS = 
+libpychrysaanalysisdb_la_LDFLAGS = 		\
+	items/libpychrysaanalysisdbitems.la
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
diff --git a/plugins/pychrysa/analysis/db/items/comment.c b/plugins/pychrysa/analysis/db/items/comment.c
index 1bb2863..951f6ce 100644
--- a/plugins/pychrysa/analysis/db/items/comment.c
+++ b/plugins/pychrysa/analysis/db/items/comment.c
@@ -75,6 +75,9 @@ static PyObject *py_db_comment_new(PyTypeObject *type, PyObject *args, PyObject
     ret = PyArg_ParseTuple(args, "Osp", &py_vmpa, &text, &is_volatile);
     if (!ret) Py_RETURN_NONE;
 
+    ret = PyObject_IsInstance(py_vmpa, (PyObject *)get_python_vmpa_type());
+    if (!ret) return NULL;
+
     addr = get_internal_vmpa(py_vmpa);
     if (py_vmpa == NULL) Py_RETURN_NONE;
 
@@ -114,7 +117,7 @@ static PyObject *py_db_comment_get_text(PyObject *self, void *closure)
 }
 
 
-/*********************d*********************************************************
+/******************************************************************************
 *                                                                             *
 *  Paramètres  : self    = objet Python concerné par l'appel.                 *
 *                value   = valeur fournie à intégrer ou prendre en compte.    *
diff --git a/plugins/pychrysa/analysis/db/items/module.c b/plugins/pychrysa/analysis/db/items/module.c
index 3c634e3..009e823 100644
--- a/plugins/pychrysa/analysis/db/items/module.c
+++ b/plugins/pychrysa/analysis/db/items/module.c
@@ -25,6 +25,9 @@
 #include "module.h"
 
 
+#include <assert.h>
+
+
 #include "comment.h"
 
 
@@ -64,27 +67,22 @@ bool add_analysis_db_items_module_to_python_module(PyObject *super)
     if (module == NULL) return false;
 
     ret = PyState_AddModule(super, &py_chrysalide_items_module);
-    if (ret != 0) goto aadimtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.db.items");
-    if (ret != 0) goto aadimtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     Py_INCREF(module);
     ret = PyModule_AddObject(super, "items", module);
-    if (ret != 0) goto aadimtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     result = true;
 
     result &= register_python_db_comment(module);
 
- aadimtpm_exit:
-
-    if (!result)
-    {
-        printf("something went wrong in %s...\n", __FUNCTION__);
-        /* ... */
+ loading_failed:
 
-    }
+    assert(result);
 
     return result;
 
diff --git a/plugins/pychrysa/analysis/db/module.c b/plugins/pychrysa/analysis/db/module.c
index 8c527a9..08c408c 100644
--- a/plugins/pychrysa/analysis/db/module.c
+++ b/plugins/pychrysa/analysis/db/module.c
@@ -25,8 +25,12 @@
 #include "module.h"
 
 
+#include <assert.h>
+
+
 #include "collection.h"
 #include "item.h"
+#include "items/module.h"
 
 
 
@@ -65,28 +69,25 @@ bool add_analysis_db_module_to_python_module(PyObject *super)
     if (module == NULL) return false;
 
     ret = PyState_AddModule(super, &py_chrysalide_db_module);
-    if (ret != 0) goto aadmtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.db");
-    if (ret != 0) goto aadmtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     Py_INCREF(module);
     ret = PyModule_AddObject(super, "db", module);
-    if (ret != 0) goto aadmtpm_exit;
+    if (ret != 0) goto loading_failed;
 
     result = true;
 
     result &= register_python_db_collection(module);
     result &= register_python_db_item(module);
 
- aadmtpm_exit:
+    result &= add_analysis_db_items_module_to_python_module(module);
 
-    if (!result)
-    {
-        printf("something went wrong in %s...\n", __FUNCTION__);
-        /* ... */
+ loading_failed:
 
-    }
+    assert(result);
 
     return result;