From fa44be1e890cef23d0cf987dfc985d5a9fd645de Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Sun, 3 Feb 2019 14:12:02 +0100 Subject: Raised exception in some Python constructors. --- plugins/pychrysalide/analysis/contents/encapsulated.c | 2 +- plugins/pychrysalide/analysis/contents/file.c | 2 +- plugins/pychrysalide/analysis/contents/memory.c | 2 +- plugins/pychrysalide/analysis/loaded.c | 2 +- plugins/pychrysalide/analysis/loading.c | 6 +++--- plugins/pychrysalide/arch/vmpa.c | 2 +- plugins/pychrysalide/common/fnv1a.c | 2 +- plugins/pychrysalide/common/pathname.c | 4 ++-- plugins/pychrysalide/glibext/configuration.c | 10 +++++----- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/pychrysalide/analysis/contents/encapsulated.c b/plugins/pychrysalide/analysis/contents/encapsulated.c index 03db638..7af79e8 100644 --- a/plugins/pychrysalide/analysis/contents/encapsulated.c +++ b/plugins/pychrysalide/analysis/contents/encapsulated.c @@ -71,7 +71,7 @@ static PyObject *py_encaps_content_new(PyTypeObject *type, PyObject *args, PyObj get_python_binary_content_type(), &base_obj, &path, get_python_binary_content_type(), &endpoint_obj); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; base = G_BIN_CONTENT(pygobject_get(base_obj)); endpoint = G_BIN_CONTENT(pygobject_get(endpoint_obj)); diff --git a/plugins/pychrysalide/analysis/contents/file.c b/plugins/pychrysalide/analysis/contents/file.c index b7a217a..f660656 100644 --- a/plugins/pychrysalide/analysis/contents/file.c +++ b/plugins/pychrysalide/analysis/contents/file.c @@ -63,7 +63,7 @@ static PyObject *py_file_content_new(PyTypeObject *type, PyObject *args, PyObjec GBinContent *content; /* Version GLib du contenu */ ret = PyArg_ParseTuple(args, "s", &filename); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; content = g_file_content_new(filename); diff --git a/plugins/pychrysalide/analysis/contents/memory.c b/plugins/pychrysalide/analysis/contents/memory.c index 89a2aa8..d1da2e8 100644 --- a/plugins/pychrysalide/analysis/contents/memory.c +++ b/plugins/pychrysalide/analysis/contents/memory.c @@ -65,7 +65,7 @@ static PyObject *py_memory_content_new(PyTypeObject *type, PyObject *args, PyObj GBinContent *content; /* Version GLib du contenu */ ret = PyArg_ParseTuple(args, "S", &data); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; ret = PyBytes_AsStringAndSize(data, &buffer, &length); if (ret == -1) Py_RETURN_NONE; diff --git a/plugins/pychrysalide/analysis/loaded.c b/plugins/pychrysalide/analysis/loaded.c index 37d11b4..ae14164 100644 --- a/plugins/pychrysalide/analysis/loaded.c +++ b/plugins/pychrysalide/analysis/loaded.c @@ -158,7 +158,7 @@ static PyObject *py_loaded_content_detect_obfuscators(PyObject *self, PyObject * size_t i; /* Boucle de parcours */ ret = PyArg_ParseTuple(args, "p", &version); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; content = G_LOADED_CONTENT(pygobject_get(self)); diff --git a/plugins/pychrysalide/analysis/loading.c b/plugins/pychrysalide/analysis/loading.c index f785a53..0b06bd1 100644 --- a/plugins/pychrysalide/analysis/loading.c +++ b/plugins/pychrysalide/analysis/loading.c @@ -85,7 +85,7 @@ static PyObject *py_content_explorer_populate_group(PyObject *self, PyObject *ar GBinContent *content; /* Contenu nouveau au final */ ret = PyArg_ParseTuple(args, "KO!", &wid, get_python_binary_content_type(), &content_obj); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; explorer = G_CONTENT_EXPLORER(pygobject_get(self)); content = G_BIN_CONTENT(pygobject_get(content_obj)); @@ -122,7 +122,7 @@ static PyObject *py_content_explorer_note_detected(PyObject *self, PyObject *arg GLoadedContent *loaded; /* Contenu chargé au final */ ret = PyArg_ParseTuple(args, "KO!", &wid, get_python_loaded_content_type(), &loaded_obj); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; explorer = G_CONTENT_EXPLORER(pygobject_get(self)); loaded = G_LOADED_CONTENT(pygobject_get(loaded_obj)); @@ -254,7 +254,7 @@ static PyObject *py_content_resolver_add_detected(PyObject *self, PyObject *args GLoadedContent *loaded; /* Contenu chargé au final */ ret = PyArg_ParseTuple(args, "KO!", &wid, get_python_loaded_content_type(), &loaded_obj); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; resolver = G_CONTENT_RESOLVER(pygobject_get(self)); loaded = G_LOADED_CONTENT(pygobject_get(loaded_obj)); diff --git a/plugins/pychrysalide/arch/vmpa.c b/plugins/pychrysalide/arch/vmpa.c index b89c3d7..0474fe0 100644 --- a/plugins/pychrysalide/arch/vmpa.c +++ b/plugins/pychrysalide/arch/vmpa.c @@ -403,7 +403,7 @@ static PyObject *py_vmpa_new(PyTypeObject *type, PyObject *args, PyObject *kwds) virt = VMPA_NO_VIRTUAL; ret = PyArg_ParseTuple(args, "|KK", &phy, &virt); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; result = (py_vmpa_t *)type->tp_alloc(type, 0); diff --git a/plugins/pychrysalide/common/fnv1a.c b/plugins/pychrysalide/common/fnv1a.c index 5caad48..2add487 100644 --- a/plugins/pychrysalide/common/fnv1a.c +++ b/plugins/pychrysalide/common/fnv1a.c @@ -62,7 +62,7 @@ static PyObject *py_fnv1a_hash(PyObject *self, PyObject *args) fnv64_t value; /* Empreinte calculée */ ret = PyArg_ParseTuple(args, "s", &str); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; value = fnv_64a_hash(str); diff --git a/plugins/pychrysalide/common/pathname.c b/plugins/pychrysalide/common/pathname.c index e07ebe5..cbe05ed 100644 --- a/plugins/pychrysalide/common/pathname.c +++ b/plugins/pychrysalide/common/pathname.c @@ -70,7 +70,7 @@ static PyObject *py_build_relative_filename(PyObject *self, PyObject *args) char *relative; /* Chemin d'accès construit */ ret = PyArg_ParseTuple(args, "ss", &ref, &target); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; relative = build_relative_filename(ref, target); @@ -105,7 +105,7 @@ static PyObject *py_build_absolute_filename(PyObject *self, PyObject *args) char *relative; /* Chemin d'accès construit */ ret = PyArg_ParseTuple(args, "ss", &ref, &target); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; relative = build_absolute_filename(ref, target); diff --git a/plugins/pychrysalide/glibext/configuration.c b/plugins/pychrysalide/glibext/configuration.c index e74f0a4..0fefc13 100644 --- a/plugins/pychrysalide/glibext/configuration.c +++ b/plugins/pychrysalide/glibext/configuration.c @@ -152,7 +152,7 @@ static PyObject *py_config_param_new(PyTypeObject *type, PyObject *args, PyObjec value = NULL; ret = PyArg_ParseTuple(args, "sI|O", &path, &ptype, &value); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; if (value == NULL || value == Py_None) param = g_config_param_new_empty(path, ptype); @@ -834,7 +834,7 @@ static PyObject *py_generic_config_new(PyTypeObject *type, PyObject *args, PyObj GGenConfig *config; /* Version GLib du format */ ret = PyArg_ParseTuple(args, "s", &name); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; config = g_generic_config_new(name); @@ -932,7 +932,7 @@ static PyObject *py_generic_config_search(PyObject *self, PyObject *args) config = G_GEN_CONFIG(pygobject_get(self)); ret = PyArg_ParseTuple(args, "s", &path); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; param = g_generic_config_search(config, path); @@ -968,7 +968,7 @@ static PyObject *py_generic_config_add(PyObject *self, PyObject *args) config = G_GEN_CONFIG(pygobject_get(self)); ret = PyArg_ParseTuple(args, "O", ¶m); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; ret = PyObject_IsInstance(param, (PyObject *)get_python_config_param_type()); if (!ret) Py_RETURN_NONE; @@ -1010,7 +1010,7 @@ static PyObject *py_generic_config_delete(PyObject *self, PyObject *args) config = G_GEN_CONFIG(pygobject_get(self)); ret = PyArg_ParseTuple(args, "s", &path); - if (!ret) Py_RETURN_NONE; + if (!ret) return NULL; g_generic_config_delete_param(config, path); -- cgit v0.11.2-87-g4458