From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 15 Jan 2014 11:46:44 +0000 (+0100)
Subject: Revert "Revert "coredumpctl: in case of error free pattern after print""
X-Git-Tag: v209~430
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1b2457e16dbbaa5e587c5e36d274a48c585d4840

Revert "Revert "coredumpctl: in case of error free pattern after print""

In the case of the error set_consume will free the pointer 'pattern'
which is later used in log_error. Either we should stop priniting that
or use simple set_put and free pattern manually.

This reverts commit ece6b8fd5bbc1fee16f652e680e3033f2f3efc4a.
---

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 70eaf0e64..e564ab656 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -126,10 +126,11 @@ static int add_match(Set *set, const char *match) {
                 goto fail;
 
         log_debug("Adding pattern: %s", pattern);
-        r = set_consume(set, pattern);
+        r = set_put(set, pattern);
         if (r < 0) {
                 log_error("Failed to add pattern '%s': %s",
                           pattern, strerror(-r));
+                free(pattern);
                 goto fail;
         }