diff options
| -rwxr-xr-x | scripts/dbg_mkrpm | 2 | ||||
| -rw-r--r-- | src/report-python/dump_dir.c | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/scripts/dbg_mkrpm b/scripts/dbg_mkrpm index 3c5e5b24..c55805cf 100755 --- a/scripts/dbg_mkrpm +++ b/scripts/dbg_mkrpm @@ -13,7 +13,7 @@ T=/tmp/$$_$RANDOM test -d "$T" && exit 1 rm -rf BUILDROOT "abrt-$ABRTVER" "abrt-$ABRTVER".tar "abrt-$ABRTVER".tar.gz \ - abrt*.rpm report*.rpm \ + abrt*.rpm libreport*.rpm \ 2>/dev/null mkdir -p "$T"/"abrt-$ABRTVER" || exit diff --git a/src/report-python/dump_dir.c b/src/report-python/dump_dir.c index eb72e10b..b207757d 100644 --- a/src/report-python/dump_dir.c +++ b/src/report-python/dump_dir.c @@ -63,6 +63,12 @@ static PyObject *p_dd_close(PyObject *pself, PyObject *args) static PyObject *p_dd_delete(PyObject *pself, PyObject *args) { p_dump_dir *self = (p_dump_dir*)pself; +//Do we want to disallow delete() on non-opened dd? +// if (!self->dd) +// { +// PyErr_SetString(ReportError, "dump dir is not open"); +// return NULL; +// } dd_delete(self->dd); self->dd = NULL; Py_RETURN_NONE; @@ -72,6 +78,11 @@ static PyObject *p_dd_delete(PyObject *pself, PyObject *args) static PyObject *p_dd_exist(PyObject *pself, PyObject *args) { p_dump_dir *self = (p_dump_dir*)pself; + if (!self->dd) + { + PyErr_SetString(ReportError, "dump dir is not open"); + return NULL; + } const char *path; if (!PyArg_ParseTuple(args, "s", &path)) { @@ -90,6 +101,11 @@ static PyObject *p_dd_exist(PyObject *pself, PyObject *args) static PyObject *p_dd_load_text_ext(PyObject *pself, PyObject *args) { p_dump_dir *self = (p_dump_dir*)pself; + if (!self->dd) + { + PyErr_SetString(ReportError, "dump dir is not open"); + return NULL; + } const char *name; int flags = 0; if (!PyArg_ParseTuple(args, "s|i", &name, &flags)) @@ -106,6 +122,11 @@ static PyObject *p_dd_load_text_ext(PyObject *pself, PyObject *args) static PyObject *p_dd_save_text(PyObject *pself, PyObject *args) { p_dump_dir *self = (p_dump_dir*)pself; + if (!self->dd) + { + PyErr_SetString(ReportError, "dump dir is not open"); + return NULL; + } const char *name; const char *data; if (!PyArg_ParseTuple(args, "ss", &name, &data)) @@ -120,6 +141,11 @@ static PyObject *p_dd_save_text(PyObject *pself, PyObject *args) static PyObject *p_dd_save_binary(PyObject *pself, PyObject *args) { p_dump_dir *self = (p_dump_dir*)pself; + if (!self->dd) + { + PyErr_SetString(ReportError, "dump dir is not open"); + return NULL; + } const char *name; const char *data; unsigned size; |