From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 23 Sep 2010 22:20:02 +0000 (+0200)
Subject: Revert "security.c: buffer_read various fixes."
X-Git-Tag: curl-7_21_2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10f5b34ff7932060beb4d297be1241b81b64774;p=thirdparty%2Fcurl.git

Revert "security.c: buffer_read various fixes."

This reverts commit fbb38de415b7bb7d743e53a7b4b887ffb12b3e5b.
---

diff --git a/lib/security.c b/lib/security.c
index cf0a6ff61c..693be3f57e 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -223,13 +223,11 @@ static CURLcode read_data(struct connectdata *conn,
 }
 
 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;
-  DEBUGASSERT(buf->size > buf->index);
-  if(buf_capacity < len)
-    len = buf_capacity;
-  memcpy(buf, data, len);
+  if(buf->size - buf->index < len)
+    len = buf->size - buf->index;
+  memcpy(data, (char*)buf->data + buf->index, len);
   buf->index += len;
   return len;
 }