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