projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix calling freeaddrinfo() on the wrong pointer.
[tinc]
/
src
/
buffer.c
diff --git
a/src/buffer.c
b/src/buffer.c
index
3d4c329
..
a9e79aa
100644
(file)
--- a/
src/buffer.c
+++ b/
src/buffer.c
@@
-57,7
+57,7
@@
char *buffer_prepare(buffer_t *buffer, int size) {
}
// Copy data into the buffer.
}
// Copy data into the buffer.
-
+
void buffer_add(buffer_t *buffer, const char *data, int size) {
memcpy(buffer_prepare(buffer, size), data, size);
}
void buffer_add(buffer_t *buffer, const char *data, int size) {
memcpy(buffer_prepare(buffer, size), data, size);
}
@@
-82,8
+82,9
@@
static char *buffer_consume(buffer_t *buffer, int size) {
char *buffer_readline(buffer_t *buffer) {
char *newline = memchr(buffer->data + buffer->offset, '\n', buffer->len - buffer->offset);
char *buffer_readline(buffer_t *buffer) {
char *newline = memchr(buffer->data + buffer->offset, '\n', buffer->len - buffer->offset);
- if(!newline)
+ if(!newline)
{
return NULL;
return NULL;
+ }
int len = newline + 1 - (buffer->data + buffer->offset);
*newline = 0;
int len = newline + 1 - (buffer->data + buffer->offset);
*newline = 0;
@@
-93,8
+94,9
@@
char *buffer_readline(buffer_t *buffer) {
// Check if we have enough bytes in the buffer, and if so, return a pointer to the start of them.
char *buffer_read(buffer_t *buffer, int size) {
// Check if we have enough bytes in the buffer, and if so, return a pointer to the start of them.
char *buffer_read(buffer_t *buffer, int size) {
- if(buffer->len - buffer->offset < size)
+ if(buffer->len - buffer->offset < size)
{
return NULL;
return NULL;
+ }
return buffer_consume(buffer, size);
}
return buffer_consume(buffer, size);
}