diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-05 23:36:01 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-05 23:36:01 +0000 |
commit | d7dd23ffed2b54d5443ef9c0d09324a56894c739 (patch) | |
tree | 815ceff894f6c20a455bbe03e37d962307265326 | |
parent | 11bd89936db5d399a7a5f10af02c7b578735bfd5 (diff) |
- markus@cvs.openbsd.org 2001/04/05 21:02:46
[buffer.c]
better error message
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | buffer.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -29,6 +29,9 @@ | |||
29 | - markus@cvs.openbsd.org 2001/04/05 20:01:10 | 29 | - markus@cvs.openbsd.org 2001/04/05 20:01:10 |
30 | [clientloop.c] | 30 | [clientloop.c] |
31 | for ~R print message if server does not support rekeying. (and fix ~R). | 31 | for ~R print message if server does not support rekeying. (and fix ~R). |
32 | - markus@cvs.openbsd.org 2001/04/05 21:02:46 | ||
33 | [buffer.c] | ||
34 | better error message | ||
32 | 35 | ||
33 | 20010405 | 36 | 20010405 |
34 | - OpenBSD CVS Sync | 37 | - OpenBSD CVS Sync |
@@ -4901,4 +4904,4 @@ | |||
4901 | - Wrote replacements for strlcpy and mkdtemp | 4904 | - Wrote replacements for strlcpy and mkdtemp |
4902 | - Released 1.0pre1 | 4905 | - Released 1.0pre1 |
4903 | 4906 | ||
4904 | $Id: ChangeLog,v 1.1071 2001/04/05 23:34:29 mouring Exp $ | 4907 | $Id: ChangeLog,v 1.1072 2001/04/05 23:36:01 mouring Exp $ |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: buffer.c,v 1.10 2001/01/21 19:05:45 markus Exp $"); | 15 | RCSID("$OpenBSD: buffer.c,v 1.11 2001/04/05 21:02:46 markus Exp $"); |
16 | 16 | ||
17 | #include "xmalloc.h" | 17 | #include "xmalloc.h" |
18 | #include "buffer.h" | 18 | #include "buffer.h" |
@@ -112,7 +112,8 @@ void | |||
112 | buffer_get(Buffer *buffer, char *buf, u_int len) | 112 | buffer_get(Buffer *buffer, char *buf, u_int len) |
113 | { | 113 | { |
114 | if (len > buffer->end - buffer->offset) | 114 | if (len > buffer->end - buffer->offset) |
115 | fatal("buffer_get: trying to get more bytes than in buffer"); | 115 | fatal("buffer_get: trying to get more bytes %d than in buffer %d", |
116 | len, buffer->end - buffer->offset); | ||
116 | memcpy(buf, buffer->buf + buffer->offset, len); | 117 | memcpy(buf, buffer->buf + buffer->offset, len); |
117 | buffer->offset += len; | 118 | buffer->offset += len; |
118 | } | 119 | } |