diff options
author | nectar <nectar@FreeBSD.org> | 2005-02-24 22:22:53 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2005-02-24 22:22:53 +0000 |
commit | 2565fa13487d5bfc858144e431e3dfd7ffa5200e (patch) | |
tree | d83f145ef556e56c8369b30056ea9442b0017aeb /crypto/heimdal/appl/push/push.c | |
parent | 1473734316df327692d00ceb60c4610765f68749 (diff) | |
download | FreeBSD-src-2565fa13487d5bfc858144e431e3dfd7ffa5200e.zip FreeBSD-src-2565fa13487d5bfc858144e431e3dfd7ffa5200e.tar.gz |
Vendor import of Heimdal 0.6.3.
Diffstat (limited to 'crypto/heimdal/appl/push/push.c')
-rw-r--r-- | crypto/heimdal/appl/push/push.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/crypto/heimdal/appl/push/push.c b/crypto/heimdal/appl/push/push.c index 60d1654..2e6f8b8 100644 --- a/crypto/heimdal/appl/push/push.c +++ b/crypto/heimdal/appl/push/push.c @@ -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). * All rights reserved. * @@ -32,7 +32,7 @@ */ #include "push_locl.h" -RCSID("$Id: push.c,v 1.47 2003/04/04 02:10:17 assar Exp $"); +RCSID("$Id: push.c,v 1.47.2.1 2004/06/21 10:54:46 lha Exp $"); #ifdef KRB4 static int use_v4 = -1; @@ -214,9 +214,10 @@ doit(int s, int ret; char out_buf[PUSH_BUFSIZ]; int out_len = 0; - char in_buf[PUSH_BUFSIZ + 1]; /* sentinel */ + char *in_buf; + size_t in_buf_size; size_t in_len = 0; - char *in_ptr = in_buf; + char *in_ptr; pop_state state = INIT; unsigned count, bytes; unsigned asked_for = 0, retrieved = 0, asked_deleted = 0, deleted = 0; @@ -231,6 +232,10 @@ doit(int s, int i; char *tmp = NULL; + in_buf = emalloc(PUSH_BUFSIZ + 1); + in_ptr = in_buf; + in_buf_size = PUSH_BUFSIZ; + if (do_from) { char *tmp2; @@ -310,7 +315,14 @@ doit(int s, size_t rem; 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) err (1, "read"); else if (ret == 0) |