chiark / gitweb /
Revert "Revert "coredumpctl: in case of error free pattern after print""
authorLukas Nykryn <lnykryn@redhat.com>
Wed, 15 Jan 2014 11:46:44 +0000 (12:46 +0100)
committerLukas Nykryn <lnykryn@redhat.com>
Wed, 15 Jan 2014 11:46:44 +0000 (12:46 +0100)
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.

src/journal/coredumpctl.c

index 70eaf0e64c98edbae83a16773c1709ce7eab36d0..e564ab656c85c481f8934a6feeaba940cf06797e 100644 (file)
@@ -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;
         }