Blame SOURCES/wget-1.14-Fix-deadcode-and-possible-NULL-use.patch

87e294
From 613d8639c48b950f76d132b70d27e518ba6d6891 Mon Sep 17 00:00:00 2001
87e294
From: Tomas Hozza <thozza@redhat.com>
87e294
Date: Fri, 26 Apr 2013 14:42:30 +0200
87e294
Subject: [PATCH] Fix using deadcode and possible use of NULL pointer
87e294
87e294
Fix for deadcode in unique_create() so that "opened_name" parameter is
87e294
always initialized to a valid string or NULL when returning from
87e294
function.
87e294
87e294
Fix for redirect_output() so that "logfile" is not blindly used in
87e294
fprintf() call and checked if it is not NULL.
87e294
87e294
Signed-off-by: Tomas Hozza <thozza@redhat.com>
87e294
---
87e294
 src/log.c   | 2 +-
87e294
 src/utils.c | 2 +-
87e294
 2 files changed, 2 insertions(+), 2 deletions(-)
87e294
87e294
diff --git a/src/log.c b/src/log.c
87e294
index 0185df1..4f93a21 100644
87e294
--- a/src/log.c
87e294
+++ b/src/log.c
87e294
@@ -871,7 +871,7 @@ redirect_output (void)
87e294
          can do but disable printing completely. */
87e294
       fprintf (stderr, _("\n%s received.\n"), redirect_request_signal_name);
87e294
       fprintf (stderr, _("%s: %s; disabling logging.\n"),
87e294
-               logfile, strerror (errno));
87e294
+               (logfile) ? logfile : DEFAULT_LOGFILE, strerror (errno));
87e294
       inhibit_logging = true;
87e294
     }
87e294
   save_context_p = false;
87e294
diff --git a/src/utils.c b/src/utils.c
87e294
index 567dc35..7cc942f 100644
87e294
--- a/src/utils.c
87e294
+++ b/src/utils.c
87e294
@@ -703,7 +703,7 @@ unique_create (const char *name, bool binary, char **opened_name)
87e294
       xfree (uname);
87e294
       uname = unique_name (name, false);
87e294
     }
87e294
-  if (opened_name && fp != NULL)
87e294
+  if (opened_name)
87e294
     {
87e294
       if (fp)
87e294
         *opened_name = uname;
87e294
-- 
87e294
1.8.1.4
87e294