===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-buffer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/cmd-set-buffer.c	2014/03/31 21:39:31	1.15
--- src/usr.bin/tmux/cmd-set-buffer.c	2014/03/31 21:43:55	1.16
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-buffer.c,v 1.15 2014/03/31 21:39:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-buffer.c,v 1.16 2014/03/31 21:43:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 56,61 ****
--- 56,64 ----
  	pb = NULL;
  	buffer = -1;
  
+ 	if ((newsize = strlen(args->argv[0])) == 0)
+ 		return (CMD_RETURN_NORMAL);
+ 
  	if (args_has(args, 'b')) {
  		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
  		if (cause != NULL) {
***************
*** 79,86 ****
  		pdata = xmalloc(psize);
  		memcpy(pdata, pb->data, psize);
  	}
- 
- 	newsize = strlen(args->argv[0]);
  
  	pdata = xrealloc(pdata, 1, psize + newsize);
  	memcpy(pdata + psize, args->argv[0], newsize);
--- 82,87 ----