WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-08-21 15:12:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- review fixes for python module.

Browse Source 
git-svn-id: file:///svn/unbound/trunk@4969 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards
2018-11-22 13:31:21 +00:00
parent 668c0627c0
commit d21cb609a8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pythonmod/interface.i
+2 -1
View File
@@ -53,7 +53,8 @@
i = 0; cnt = 0;
while (i < len) {
char buf[LDNS_MAX_LABELLEN+1];
if(((unsigned int)name[i])+1 <= (unsigned int)sizeof(buf)) {
if(((unsigned int)name[i])+1 <= (unsigned int)sizeof(buf) &&
i+(int)((unsigned int)name[i]) < len) {
memmove(buf, name + i + 1, (unsigned int)name[i]);
buf[(unsigned int)name[i]] = 0;
PyList_SetItem(list, cnt, PyString_FromString(buf));
pythonmod/pythonmod.c
+4 -3
View File
@@ -139,7 +139,7 @@ log_py_err(void)
modStringIO = PyImport_ImportModule("io");
if (modStringIO==NULL) {
log_err("pythonmod: cannot print exception, "
"cannot ImportModule cStringIO or StringIO");
"cannot ImportModule cStringIO or StringIO or io");
goto cleanup;
}
modTB = PyImport_ImportModule("traceback");
@@ -159,7 +159,7 @@ log_py_err(void)
obStringIO = PyObject_CallObject(obFuncStringIO, NULL);
if (obStringIO==NULL) {
log_err("pythonmod: cannot print exception, "
"cannot cStringIO.StringIO()");
"cannot call cStringIO.StringIO()");
goto cleanup;
}
@@ -206,7 +206,8 @@ log_py_err(void)
/* And it should be a string all ready to go - duplicate it. */
if (!PyString_Check(obResult) && !PyUnicode_Check(obResult)) {
log_err("pythonmod: cannot print exception, "
"cStringIO.getvalue() result did not String_Check");
"cStringIO.getvalue() result did not String_Check"
" or Unicode_Check");
goto cleanup;
}
if(PyString_Check(obResult)) {