--------------------- PatchSet 10326 Date: 2007/12/27 14:25:57 Author: adri Branch: s27_adri Tag: (none) Log: Fix EOF condition handling. Members: src/client_side.c:1.202.2.9.4.21->1.202.2.9.4.22 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.202.2.9.4.21 retrieving revision 1.202.2.9.4.22 diff -u -r1.202.2.9.4.21 -r1.202.2.9.4.22 --- squid/src/client_side.c 22 Dec 2007 14:38:58 -0000 1.202.2.9.4.21 +++ squid/src/client_side.c 27 Dec 2007 14:25:57 -0000 1.202.2.9.4.22 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.202.2.9.4.21 2007/12/22 14:38:58 adri Exp $ + * $Id: client_side.c,v 1.202.2.9.4.22 2007/12/27 14:25:57 adri Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -3024,7 +3024,7 @@ static void clientSendMoreData(void *data, mem_node_ref ref, ssize_t size) { - const char *buf = ref.node->data + ref.offset; + const char *buf = NULL; clientHttpRequest *http = data; StoreEntry *entry = http->entry; ConnStateData *conn = http->conn; @@ -3060,6 +3060,8 @@ stmemNodeUnref(&ref); return; } + assert(ref.node->data); + buf = ref.node->data + ref.offset; if (!http->request->range && !http->request->flags.chunked_response) { /* Avoid copying to MemBuf for non-range requests */ http->out.offset += size;