From b2e791b574a60e481d2a5813157ab00cb99cc32f Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 13 May 2014 22:54:18 +0000 Subject: [PATCH] Don't allow multiple buffers with the same name, from Thomas Adam. --- paste.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/paste.c b/paste.c index 11a4f006..245cca37 100644 --- a/paste.c +++ b/paste.c @@ -176,7 +176,7 @@ paste_add(char *data, size_t size) int paste_rename(const char *oldname, const char *newname, char **cause) { - struct paste_buffer *pb; + struct paste_buffer *pb, *pb_new; if (cause != NULL) *cause = NULL; @@ -195,7 +195,14 @@ paste_rename(const char *oldname, const char *newname, char **cause) pb = paste_get_name(oldname); if (pb == NULL) { if (cause != NULL) - xasprintf(cause, "no buffer %s", oldname); + xasprintf(cause, "no buffer %s", oldname); + return (-1); + } + + pb_new = paste_get_name(newname); + if (pb_new != NULL) { + if (cause != NULL) + xasprintf(cause, "buffer %s already exists", newname); return (-1); }