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

python: More type conversion fixes.

Browse Source 
* lang/python/helpers.c (pyPassphraseCb): Cope with 'uid_hint' being
NULL, convert it to an Unicode object, and cope with the callback
returning both Unicode and bytes objects.

Signed-off-by: Justus Winter <justus@gnupg.org>
This commit is contained in:
Justus Winter 2016-05-19 10:55:34 +02:00
parent 07f71cd177
commit c1c893e338
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lang/python/helpers.c
View File

@ -82,7 +82,15 @@ static gpgme_error_t pyPassphraseCb(void *hook,
args = PyTuple_New(3); args = PyTuple_New(3);
} }
PyTuple_SetItem(args, 0, PyBytes_FromString(uid_hint)); if (uid_hint == NULL)
{
Py_INCREF(Py_None);
PyTuple_SetItem(args, 0, Py_None);
}
else
PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(uid_hint, strlen (uid_hint),
"strict"));
PyTuple_SetItem(args, 1, PyBytes_FromString(passphrase_info)); PyTuple_SetItem(args, 1, PyBytes_FromString(passphrase_info));
PyTuple_SetItem(args, 2, PyBool_FromLong((long)prev_was_bad)); PyTuple_SetItem(args, 2, PyBool_FromLong((long)prev_was_bad));
if (dataarg) { if (dataarg) {
@ -98,7 +106,21 @@ static gpgme_error_t pyPassphraseCb(void *hook,
if (!retval) { if (!retval) {
write(fd, "\n", 1); write(fd, "\n", 1);
} else { } else {
write(fd, PyBytes_AsString(retval), PyBytes_Size(retval)); char *buf;
size_t len;
if (PyBytes_Check(retval))
buf = PyBytes_AsString(retval), len = PyBytes_Size(retval);
else if (PyUnicode_Check(retval))
buf = PyUnicode_AsUTF8AndSize(retval, &len);
else
{
PyErr_Format(PyExc_TypeError,
"expected str or bytes from passphrase callback, got %s",
retval->ob_type->tp_name);
return gpg_error(GPG_ERR_GENERAL);
}
write(fd, buf, len);
write(fd, "\n", 1); write(fd, "\n", 1);
Py_DECREF(retval); Py_DECREF(retval);
} }