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

Fix bug 5334

Browse Source 
I did not test with a zero length file :-)
This commit is contained in:
Volker Lendecke 2008-03-18 13:20:10 +01:00 committed by Karolin Seeger
parent b59b436997
commit 7d7a73944c
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/include/async_req.h
View File

@ -74,6 +74,13 @@ void async_req_done(struct async_req *req);
*/
void async_req_error(struct async_req *req, NTSTATUS status);
/*
* If a request is finished or ends in error even before it has the chance to
* trigger the event loop, post a status. This creates an immediate timed
* event to call the async function if there is any.
*/
bool async_post_status(struct async_req *req, NTSTATUS status);
/*
* Convenience helper to easily check alloc failure within a callback.
*

30
source/lib/async_req.c
View File

@ -58,6 +58,36 @@ void async_req_error(struct async_req *req, NTSTATUS status)
}
}
static void async_trigger(struct event_context *ev, struct timed_event *te,
const struct timeval *now, void *priv)
{
struct async_req *req = talloc_get_type_abort(priv, struct async_req);
TALLOC_FREE(te);
if (NT_STATUS_IS_OK(req->status)) {
async_req_done(req);
}
else {
async_req_error(req, req->status);
}
}
bool async_post_status(struct async_req *req, NTSTATUS status)
{
/*
* Used if a request is finished before it even started
*/
req->status = status;
if (event_add_timed(req->event_ctx, req, timeval_zero(),
"async_trigger",
async_trigger, req) == NULL) {
return false;
}
return true;
}
bool async_req_nomem(const void *p, struct async_req *req)
{
if (p != NULL) {

8
source/libsmb/clireadwrite.c
View File

@ -262,6 +262,14 @@ struct async_req *cli_pull_send(TALLOC_CTX *mem_ctx, struct cli_state *cli,
state->pushed = 0;
state->top_req = 0;
if (size == 0) {
if (!async_post_status(result, NT_STATUS_OK)) {
goto failed;
}
return result;
}
state->chunk_size = cli_read_max_bufsize(cli);
state->num_reqs = MAX(window_size/state->chunk_size, 1);