sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

pynbt: catch type errors in PyObject_AsNBTName()

Browse Source 
This fixes some known segfaults.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2018-04-24 12:34:50 +12:00 committed by Andrew Bartlett
parent e0c0538390
commit bdb4132617
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libcli/nbt/pynbt.c
View File

@ -97,13 +97,28 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke
if (PyTuple_Check(obj)) {
if (PyTuple_Size(obj) == 2) {
name->name = PyStr_AsString(PyTuple_GetItem(obj, 0));
if (name->name == NULL) {
goto err;
}
name->type = PyInt_AsLong(PyTuple_GetItem(obj, 1));
if (name->type == -1 && PyErr_Occurred()) {
goto err;
}
name->scope = NULL;
return true;
} else if (PyTuple_Size(obj) == 3) {
name->name = PyStr_AsString(PyTuple_GetItem(obj, 0));
if (name->name == NULL) {
goto err;
}
name->scope = PyStr_AsString(PyTuple_GetItem(obj, 1));
if (name->scope == NULL) {
goto err;
}
name->type = PyInt_AsLong(PyTuple_GetItem(obj, 2));
if (name->type == -1 && PyErr_Occurred()) {
goto err;
}
return true;
} else {
PyErr_SetString(PyExc_TypeError, "Invalid tuple size");
@ -114,11 +129,14 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke
if (PyStr_Check(obj) || PyUnicode_Check(obj)) {
/* FIXME: Parse string to be able to interpret things like RHONWYN<02> ? */
name->name = PyStr_AsString(obj);
if (name->name == NULL) {
goto err;
}
name->scope = NULL;
name->type = 0;
return true;
}
err:
PyErr_SetString(PyExc_TypeError, "Invalid type for object");
return false;
}

1
selftest/knownfail.d/python-segfaults
View File

@ -5,4 +5,3 @@ samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_hive_open_ldb
samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_chunk_1
samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__1
samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_net_replicate_init__3
samba.tests.segfault.samba.tests.segfault.SegfaultTests.test_netbios_query_name