upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -4,6 +4,7 @@
succeed for the python module. succeed for the python module.
- pythonmod logs the python error and traceback on failure. - pythonmod logs the python error and traceback on failure.
- ignore debug python module for test in doxygen output. - ignore debug python module for test in doxygen output.
- review fixes for python module.
21 November 2018: Wouter 21 November 2018: Wouter
- Scrub NS records from NODATA responses as well. - Scrub NS records from NODATA responses as well.

3
pythonmod/interface.i
View file

@ -53,7 +53,8 @@
i = 0; cnt = 0; i = 0; cnt = 0;
while (i < len) { while (i < len) {
char buf[LDNS_MAX_LABELLEN+1]; 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]); memmove(buf, name + i + 1, (unsigned int)name[i]);
buf[(unsigned int)name[i]] = 0; buf[(unsigned int)name[i]] = 0;
PyList_SetItem(list, cnt, PyString_FromString(buf)); PyList_SetItem(list, cnt, PyString_FromString(buf));

7
pythonmod/pythonmod.c
View file

@ -139,7 +139,7 @@ log_py_err(void)
modStringIO = PyImport_ImportModule("io"); modStringIO = PyImport_ImportModule("io");
if (modStringIO==NULL) { if (modStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot ImportModule cStringIO or StringIO"); "cannot ImportModule cStringIO or StringIO or io");
goto cleanup; goto cleanup;
} }
modTB = PyImport_ImportModule("traceback"); modTB = PyImport_ImportModule("traceback");
@ -159,7 +159,7 @@ log_py_err(void)
obStringIO = PyObject_CallObject(obFuncStringIO, NULL); obStringIO = PyObject_CallObject(obFuncStringIO, NULL);
if (obStringIO==NULL) { if (obStringIO==NULL) {
log_err("pythonmod: cannot print exception, " log_err("pythonmod: cannot print exception, "
"cannot cStringIO.StringIO()"); "cannot call cStringIO.StringIO()");
goto cleanup; goto cleanup;
} }
@ -206,7 +206,8 @@ log_py_err(void)
/* And it should be a string all ready to go - duplicate it. */ /* And it should be a string all ready to go - duplicate it. */
if (!PyString_Check(obResult) && !PyUnicode_Check(obResult)) { if (!PyString_Check(obResult) && !PyUnicode_Check(obResult)) {
log_err("pythonmod: cannot print exception, " 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; goto cleanup;
} }
if(PyString_Check(obResult)) { if(PyString_Check(obResult)) {