extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-26 08:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 652:

Browse Source 
In load-buffer, read until EOF rather than using stat() and reading a fixed
size. Allows use of FIFOs and whatnot. From Tiago Cunha, idea from Fulvio
Ciriaco.
This commit is contained in:
Tiago Cunha 2010-02-26 13:30:07 +00:00
parent a0e7539743
commit 8da8bc477f
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmd-load-buffer.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-load-buffer.c,v 1.14 2009-11-28 14:55:22 tcunha Exp $ */ /* $Id: cmd-load-buffer.c,v 1.15 2010-02-26 13:30:07 tcunha Exp $ */
/* /*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@ -16,13 +16,10 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "tmux.h" #include "tmux.h"
@ -48,11 +45,11 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
{ {
struct cmd_buffer_data *data = self->data; struct cmd_buffer_data *data = self->data;
struct session *s; struct session *s;
struct stat sb;
FILE *f; FILE *f;
char *pdata = NULL; char *pdata, *new_pdata;
size_t psize; size_t psize;
u_int limit; u_int limit;
int ch;
if ((s = cmd_find_session(ctx, data->target)) == NULL) if ((s = cmd_find_session(ctx, data->target)) == NULL)
return (-1); return (-1);
@ -62,29 +59,23 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
return (-1); return (-1);
} }
if (fstat(fileno(f), &sb) < 0) { pdata = NULL;
ctx->error(ctx, "%s: %s", data->arg, strerror(errno)); psize = 0;
while ((ch = getc(f)) != EOF) {
/* Do not let the server die due to memory exhaustion. */
if ((new_pdata = realloc(pdata, psize + 2)) == NULL) {
ctx->error(ctx, "realloc error: %s", strerror(errno));
goto error; goto error;
} }
if (sb.st_size <= 0 || (uintmax_t) sb.st_size > SIZE_MAX) { pdata = new_pdata;
ctx->error(ctx, "%s: file empty or too large", data->arg); pdata[psize++] = ch;
goto error; }
} if (ferror(f)) {
psize = (size_t) sb.st_size; ctx->error(ctx, "%s: read error", data->arg);
/*
* We don't want to die due to memory exhaustion, hence xmalloc can't
* be used here.
*/
if ((pdata = malloc(psize)) == NULL) {
ctx->error(ctx, "malloc error: %s", strerror(errno));
goto error;
}
if (fread(pdata, 1, psize, f) != psize) {
ctx->error(ctx, "%s: fread error", data->arg);
goto error; goto error;
} }
if (pdata != NULL)
pdata[psize] = '\0';
fclose(f); fclose(f);