Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

1 files changed, 6 insertions, 8 deletions

diff --git a/src/Hooks/CCpp.cpp b/src/Hooks/CCpp.cpp
index 3ab8f406..2b753819 100644
--- a/src/Hooks/CCpp.cpp
+++ b/src/Hooks/CCpp.cpp
@@ -65,7 +65,7 @@ static char* get_cmdline(pid_t pid)
         if (len > 0)
         {
             /* In Linux, there is always one trailing NUL byte,
-	     * prevent it from being replaced by space below.
+             * prevent it from being replaced by space below.
              */
             if (cmdline[len - 1] == '\0')
                 len--;
@@ -164,22 +164,20 @@ int main(int argc, char** argv)
 
     try
     {
-        char* executable;
-        char* cmdline;
-        executable = get_executable(pid);
-        cmdline = get_cmdline(pid);
-        if (executable == NULL || cmdline == NULL)
+        char* executable = get_executable(pid);
+        if (executable == NULL)
         {
-            error_msg_and_die("can not get proc info for pid %u", (int)pid);
+            error_msg_and_die("can't read /proc/%u/exe link", (int)pid);
         }
         if (strstr(executable, "/abrt"))
         {
             /* free(executable); - why bother? */
-            /* free(cmdline); */
             error_msg_and_die("pid %u is '%s', not dumping it to avoid abrt recursion",
                             (int)pid, executable);
         }
 
+        char* cmdline = get_cmdline(pid); /* never NULL */
+
         char path[PATH_MAX];
         snprintf(path, sizeof(path), "%s/ccpp-%ld-%u", dddir, (long)time(NULL), (int)pid);