===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/paste.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src/usr.bin/tmux/paste.c	2014/11/05 23:25:02	1.26
+++ src/usr.bin/tmux/paste.c	2015/04/07 13:06:22	1.27
@@ -1,4 +1,4 @@
-/* $OpenBSD: paste.c,v 1.26 2014/11/05 23:25:02 nicm Exp $ */
+/* $OpenBSD: paste.c,v 1.27 2015/04/07 13:06:22 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -247,9 +247,6 @@
 		return (-1);
 	}
 
-	pb = paste_get_name(name);
-	if (pb != NULL)
-		paste_free_name(name);
 
 	pb = xmalloc(sizeof *pb);
 
@@ -260,6 +257,9 @@
 
 	pb->automatic = 0;
 	pb->order = paste_next_order++;
+
+	if (paste_get_name(name) != NULL)
+		paste_free_name(name);
 
 	RB_INSERT(paste_name_tree, &paste_by_name, pb);
 	RB_INSERT(paste_time_tree, &paste_by_time, pb);