aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-28 14:55:22 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-28 14:55:22 +0000
commit91cf94b34b9717aff4d5cadb26437f3a2ce3875f (patch)
treee08384e795e72a346431858897912b65e00ebda6
parentfabf40b3b3c9f37930aa99e40771a069a9c94adf (diff)
downloadrtmux-91cf94b34b9717aff4d5cadb26437f3a2ce3875f.tar.gz
rtmux-91cf94b34b9717aff4d5cadb26437f3a2ce3875f.tar.bz2
rtmux-91cf94b34b9717aff4d5cadb26437f3a2ce3875f.zip
Sync OpenBSD patchset 570:
Change paranoia check to check for <= 0 and to avoid warning.
-rw-r--r--cmd-load-buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 7114fda4..c4681e02 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-load-buffer.c,v 1.13 2009-11-28 14:54:12 tcunha Exp $ */
+/* $Id: cmd-load-buffer.c,v 1.14 2009-11-28 14:55:22 tcunha Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -66,8 +66,8 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
goto error;
}
- if (sb.st_size > SIZE_MAX) {
- ctx->error(ctx, "%s: file too large", data->arg);
+ if (sb.st_size <= 0 || (uintmax_t) sb.st_size > SIZE_MAX) {
+ ctx->error(ctx, "%s: file empty or too large", data->arg);
goto error;
}
psize = (size_t) sb.st_size;