generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "security.c: buffer_read various fixes."

Browse Source 
This reverts commit fbb38de415b7bb7d743e53a7b4b887ffb12b3e5b.
This commit is contained in:
Daniel Stenberg 2010-09-24 00:20:02 +02:00
parent b1df37c60e
commit a10f5b34ff
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/security.c
View File

@ -223,13 +223,11 @@ static CURLcode read_data(struct connectdata *conn,
} }
static size_t static size_t
buffer_read(struct krb4buffer *buf, const char *data, size_t len) buffer_read(struct krb4buffer *buf, void *data, size_t len)
{ {
size_t buf_capacity = buf->size - buf->index; if(buf->size - buf->index < len)
DEBUGASSERT(buf->size > buf->index); len = buf->size - buf->index;
if(buf_capacity < len) memcpy(data, (char*)buf->data + buf->index, len);
len = buf_capacity;
memcpy(buf, data, len);
buf->index += len; buf->index += len;
return len; return len;
} }