GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Fix types and error handling.

Browse Source 
* lang/python/helpers.c (_pyme_edit_cb): Drop the const.
(_pyme_assuan_{data,inquire,status}_cb): Fix error handling.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-09-13 13:25:15 +02:00
parent c0c50318bd
commit 4abff7d750
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lang/python/helpers.c
View File

@ -692,7 +692,7 @@ gpgme_error_t _pyme_edit_cb(void *opaque, gpgme_status_code_t status,
} else { } else {
if (fd>=0 && retval && PyUnicode_Check(retval)) { if (fd>=0 && retval && PyUnicode_Check(retval)) {
PyObject *encoded = NULL; PyObject *encoded = NULL;
const char *buffer; char *buffer;
Py_ssize_t size; Py_ssize_t size;
encoded = PyUnicode_AsUTF8String(retval); encoded = PyUnicode_AsUTF8String(retval);
@ -999,7 +999,10 @@ _pyme_assuan_data_cb (void *hook, const void *data, size_t datalen)
py_data = PyBytes_FromStringAndSize(data, datalen); py_data = PyBytes_FromStringAndSize(data, datalen);
if (py_data == NULL) if (py_data == NULL)
return NULL; /* raise */ {
err = _pyme_exception2code();
goto leave;
}
retval = PyObject_CallFunctionObjArgs(func, py_data, NULL); retval = PyObject_CallFunctionObjArgs(func, py_data, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
@ -1033,23 +1036,29 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
py_name = PyUnicode_FromString(name); py_name = PyUnicode_FromString(name);
if (py_name == NULL) if (py_name == NULL)
return NULL; /* raise */ {
err = _pyme_exception2code();
goto leave;
}
py_args = PyUnicode_FromString(args); py_args = PyUnicode_FromString(args);
if (py_args == NULL) if (py_args == NULL)
return NULL; /* raise */ {
err = _pyme_exception2code();
goto leave;
}
retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL); retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = _pyme_exception2code(); err = _pyme_exception2code();
Py_DECREF(py_name);
Py_DECREF(py_args);
Py_XDECREF(retval); Py_XDECREF(retval);
/* FIXME: Returning data is not yet implemented. */ /* FIXME: Returning data is not yet implemented. */
r_data = NULL; *r_data = NULL;
leave: leave:
Py_XDECREF(py_name);
Py_XDECREF(py_args);
if (err) if (err)
_pyme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;
@ -1074,20 +1083,26 @@ _pyme_assuan_status_cb (void *hook, const char *status, const char *args)
py_status = PyUnicode_FromString(status); py_status = PyUnicode_FromString(status);
if (py_status == NULL) if (py_status == NULL)
return NULL; /* raise */ {
err = _pyme_exception2code();
goto leave;
}
py_args = PyUnicode_FromString(args); py_args = PyUnicode_FromString(args);
if (py_args == NULL) if (py_args == NULL)
return NULL; /* raise */ {
err = _pyme_exception2code();
goto leave;
}
retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL); retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = _pyme_exception2code(); err = _pyme_exception2code();
Py_DECREF(py_status);
Py_DECREF(py_args);
Py_XDECREF(retval); Py_XDECREF(retval);
leave: leave:
Py_XDECREF(py_status);
Py_XDECREF(py_args);
if (err) if (err)
_pyme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;