Sync OpenBSD patchset 318:

Give each paste buffer a size member instead of requiring them to be
zero-terminated.

1 files changed, 9 insertions, 10 deletions

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 99cd1f00..7a79c502 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-load-buffer.c,v 1.9 2009-07-30 21:07:23 tcunha Exp $ */
+/* $Id: cmd-load-buffer.c,v 1.10 2009-09-07 23:48:54 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -48,15 +48,15 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_buffer_data	*data = self->data;
 	struct session		*s;
-	struct stat		statbuf;
+	struct stat		 sb;
 	FILE			*f;
-	char			*buf;
-	u_int			limit;
+	u_char		      	*buf;
+	u_int			 limit;
 
 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);
 
-	if (stat(data->arg, &statbuf) < 0) {
+	if (stat(data->arg, &sb) < 0) {
 		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
 		return (-1);
 	}
@@ -70,28 +70,27 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 	 * We don't want to die due to memory exhaustion, hence xmalloc can't
 	 * be used here.
 	 */
-	if ((buf = malloc(statbuf.st_size + 1)) == NULL) {
+	if ((buf = malloc(sb.st_size + 1)) == NULL) {
 		ctx->error(ctx, "malloc error: %s", strerror(errno));
 		fclose(f);
 		return (-1);
 	}
 
-	if (fread(buf, 1, statbuf.st_size, f) != (size_t) statbuf.st_size) {
+	if (fread(buf, 1, sb.st_size, f) != (size_t) sb.st_size) {
 		ctx->error(ctx, "%s: fread error", data->arg);
 		xfree(buf);
 		fclose(f);
 		return (-1);
 	}
 
-	buf[statbuf.st_size] = '\0';
 	fclose(f);
 
 	limit = options_get_number(&s->options, "buffer-limit");
 	if (data->buffer == -1) {
-		paste_add(&s->buffers, buf, limit);
+		paste_add(&s->buffers, buf, sb.st_size, limit);
 		return (0);
 	}
-	if (paste_replace(&s->buffers, data->buffer, buf) != 0) {
+	if (paste_replace(&s->buffers, data->buffer, buf, sb.st_size) != 0) {
 		ctx->error(ctx, "no buffer %d", data->buffer);
 		xfree(buf);
 		return (-1);