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

s3:pylibsmb: make use of protocol independent cli_read_send/recv in py_cli_read()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=7113
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11892
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Tim Beale <timbeale@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2018-12-07 14:28:04 +01:00
parent 3c3b44004f
commit 64e68abdc9
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source3/libsmb/pylibsmb.c
View File

@ -769,8 +769,8 @@ static PyObject *py_cli_read(struct py_cli_state *self, PyObject *args,
unsigned size;
struct tevent_req *req;
NTSTATUS status;
uint8_t *buf;
ssize_t buflen;
char *buf;
size_t received;
PyObject *result;
static const char *kwlist[] = {
@ -782,20 +782,41 @@ static PyObject *py_cli_read(struct py_cli_state *self, PyObject *args,
return NULL;
}
req = cli_read_andx_send(NULL, self->ev, self->cli, fnum,
offset, size);
if (!py_tevent_req_wait_exc(self, req)) {
result = PyBytes_FromStringAndSize(NULL, size);
if (result == NULL) {
return NULL;
}
status = cli_read_andx_recv(req, &buflen, &buf);
buf = PyBytes_AS_STRING(result);
req = cli_read_send(NULL, self->ev, self->cli, fnum,
buf, offset, size);
if (!py_tevent_req_wait_exc(self, req)) {
Py_XDECREF(result);
return NULL;
}
status = cli_read_recv(req, &received);
TALLOC_FREE(req);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(req);
Py_XDECREF(result);
PyErr_SetNTSTATUS(status);
return NULL;
}
result = PyBytes_FromStringAndSize((const char *)buf, buflen);
TALLOC_FREE(req);
if (received > size) {
Py_XDECREF(result);
PyErr_Format(PyExc_IOError,
"read invalid - got %zu requested %u",
received, size);
return NULL;
}
if (received < size) {
if (_PyBytes_Resize(&result, received) < 0) {
return NULL;
}
}
return result;
}