[systemd-commits] src/journal

Lukas Nykryn lnykryn at kemper.freedesktop.org
Wed Jan 15 03:57:08 PST 2014


 src/journal/coredumpctl.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1b2457e16dbbaa5e587c5e36d274a48c585d4840
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Jan 15 12:46:44 2014 +0100

    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 70eaf0e..e564ab6 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;
         }
 



More information about the systemd-commits mailing list