===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-load-buffer.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/tmux/cmd-load-buffer.c	2012/05/21 18:27:42	1.20
--- src/usr.bin/tmux/cmd-load-buffer.c	2012/07/10 11:53:01	1.21
***************
*** 1,4 ****
! /* $OpenBSD: cmd-load-buffer.c,v 1.20 2012/05/21 18:27:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-load-buffer.c,v 1.21 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 62,68 ****
  		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
  		if (cause != NULL) {
  			ctx->error(ctx, "buffer %s", cause);
! 			xfree(cause);
  			return (-1);
  		}
  	}
--- 62,68 ----
  		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
  		if (cause != NULL) {
  			ctx->error(ctx, "buffer %s", cause);
! 			free(cause);
  			return (-1);
  		}
  	}
***************
*** 76,82 ****
  		    buffer_ptr, &cause);
  		if (error != 0) {
  			ctx->error(ctx, "%s: %s", path, cause);
! 			xfree(cause);
  			return (-1);
  		}
  		return (1);
--- 76,82 ----
  		    buffer_ptr, &cause);
  		if (error != 0) {
  			ctx->error(ctx, "%s: %s", path, cause);
! 			free(cause);
  			return (-1);
  		}
  		return (1);
***************
*** 127,141 ****
  	}
  	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
  		ctx->error(ctx, "no buffer %d", buffer);
! 		xfree(pdata);
  		return (-1);
  	}
  
  	return (0);
  
  error:
! 	if (pdata != NULL)
! 		xfree(pdata);
  	if (f != NULL)
  		fclose(f);
  	return (-1);
--- 127,140 ----
  	}
  	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
  		ctx->error(ctx, "no buffer %d", buffer);
! 		free(pdata);
  		return (-1);
  	}
  
  	return (0);
  
  error:
! 	free(pdata);
  	if (f != NULL)
  		fclose(f);
  	return (-1);
***************
*** 158,164 ****
  
  	psize = EVBUFFER_LENGTH(c->stdin_data);
  	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) {
! 		xfree(data);
  		return;
  	}
  	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
--- 157,163 ----
  
  	psize = EVBUFFER_LENGTH(c->stdin_data);
  	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) {
! 		free(data);
  		return;
  	}
  	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
***************
*** 174,178 ****
  		server_push_stderr(c);
  	}
  
! 	xfree(data);
  }
--- 173,177 ----
  		server_push_stderr(c);
  	}
  
! 	free(data);
  }