oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

alloc memory to handle very long lines

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13937 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-06-17 14:03:35 +00:00
parent 8b118a9f4f
commit 586752552d
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appl/push/push.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997-2001, 2003 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -214,9 +214,10 @@ doit(int s,
int ret; int ret;
char out_buf[PUSH_BUFSIZ]; char out_buf[PUSH_BUFSIZ];
int out_len = 0; int out_len = 0;
char in_buf[PUSH_BUFSIZ + 1]; /* sentinel */ char *in_buf;
size_t in_buf_size;
size_t in_len = 0; size_t in_len = 0;
char *in_ptr = in_buf; char *in_ptr;
pop_state state = INIT; pop_state state = INIT;
unsigned count, bytes; unsigned count, bytes;
unsigned asked_for = 0, retrieved = 0, asked_deleted = 0, deleted = 0; unsigned asked_for = 0, retrieved = 0, asked_deleted = 0, deleted = 0;
@@ -231,6 +232,10 @@ doit(int s,
int i; int i;
char *tmp = NULL; char *tmp = NULL;
in_buf = emalloc(PUSH_BUFSIZ + 1);
in_ptr = in_buf;
in_buf_size = PUSH_BUFSIZ;
if (do_from) { if (do_from) {
char *tmp2; char *tmp2;
@@ -310,7 +315,14 @@ doit(int s,
size_t rem; size_t rem;
int blank_line = 0; int blank_line = 0;
ret = read (s, in_ptr, sizeof(in_buf) - in_len - 1); if(in_len >= in_buf_size) {
char *tmp = erealloc(in_buf, in_buf_size + PUSH_BUFSIZ + 1);
in_ptr = tmp + (in_ptr - in_buf);
in_buf = tmp;
in_buf_size += PUSH_BUFSIZ;
}
ret = read (s, in_ptr, in_buf_size - in_len);
if (ret < 0) if (ret < 0)
err (1, "read"); err (1, "read");
else if (ret == 0) else if (ret == 0)