Fix using deadcode and possible use of NULL pointer

Fix for deadcode in unique_create() so that "opened_name" parameter is
always initialized to a valid string or NULL when returning from
function.

Fix for redirect_output() so that "logfile" is not blindly used in
fprintf() call and checked if it is not NULL.

Signed-off-by: Tomas Hozza <thozza@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 0240976232b7c39fc417d8c8de198c6e54aa1963..5b978ebbd934e10e9987be1da01969b2628dc05c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-26  Tomas Hozza  <thozza@redhat.com> (tiny change)
+
+       * log.c (redirect_output): Use DEFAULT_LOGFILE in diagnostic message
+       when `logfile' is NULL.
+       * utils.c (unique_create): Ensure `logfile' has always a value.
+
 2013-06-26  Darshit Shah <darnir@gmail.com>
 
        * http.c (gethttp): Reverse change by commit 90896 that prevented

diff --git a/src/log.c b/src/log.c
index 0185df19ccbc3663b88d2963f5b0ac832101f0b2..4f93a21cb050446b7325092d5bcf66e9abdbea83 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -871,7 +871,7 @@ redirect_output (void)
          can do but disable printing completely. */
       fprintf (stderr, _("\n%s received.\n"), redirect_request_signal_name);
       fprintf (stderr, _("%s: %s; disabling logging.\n"),
-               logfile, strerror (errno));
+               (logfile) ? logfile : DEFAULT_LOGFILE, strerror (errno));
       inhibit_logging = true;
     }
   save_context_p = false;

diff --git a/src/utils.c b/src/utils.c
index f87853dc5489b9e3748184793fc6d3a9f0c8d5ed..2ec960183f4be3060ae2d8439ad0cfe73c170792 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -703,7 +703,7 @@ unique_create (const char *name, bool binary, char **opened_name)
       xfree (uname);
       uname = unique_name (name, false);
     }
-  if (opened_name && fp != NULL)
+  if (opened_name)
     {
       if (fp)
         *opened_name = uname;