Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Smith <psmith@gnu.org> |
| 3 | Date: Mon, 20 Oct 2014 01:54:56 -0400 |
| 4 | Subject: [PATCH] * main.c (main): [SV 43434] Handle NULL returns from |
| 5 | ttyname(). |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | |
| 9 | From: http://git.savannah.gnu.org/cgit/make.git/commit/?id=292da6f6867b75a5af7ddbb639a1feae022f438f |
| 10 | |
| 11 | --- |
| 12 | main.c | 15 ++++++++++----- |
| 13 | makeint.h | 3 ++- |
| 14 | 2 files changed, 12 insertions(+), 6 deletions(-) |
| 15 | |
| 16 | diff --git a/main.c b/main.c |
| 17 | index b2d169c..0cdb8a8 100644 |
| 18 | --- a/main.c |
| 19 | +++ b/main.c |
| 20 | @@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) |
| 21 | #ifdef HAVE_ISATTY |
| 22 | if (isatty (fileno (stdout))) |
| 23 | if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) |
| 24 | - define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), |
| 25 | - o_default, 0)->export = v_export; |
| 26 | - |
| 27 | + { |
| 28 | + const char *tty = TTYNAME (fileno (stdout)); |
| 29 | + define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, |
| 30 | + o_default, 0)->export = v_export; |
| 31 | + } |
| 32 | if (isatty (fileno (stderr))) |
| 33 | if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) |
| 34 | - define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), |
| 35 | - o_default, 0)->export = v_export; |
| 36 | + { |
| 37 | + const char *tty = TTYNAME (fileno (stderr)); |
| 38 | + define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, |
| 39 | + o_default, 0)->export = v_export; |
| 40 | + } |
| 41 | #endif |
| 42 | |
| 43 | /* Reset in case the switches changed our minds. */ |
| 44 | diff --git a/makeint.h b/makeint.h |
| 45 | index 6223936..2009f41 100644 |
| 46 | --- a/makeint.h |
| 47 | +++ b/makeint.h |
| 48 | @@ -436,10 +436,11 @@ extern struct rlimit stack_limit; |
| 49 | /* The number of bytes needed to represent the largest integer as a string. */ |
| 50 | #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") |
| 51 | |
| 52 | +#define DEFAULT_TTYNAME "true" |
| 53 | #ifdef HAVE_TTYNAME |
| 54 | # define TTYNAME(_f) ttyname (_f) |
| 55 | #else |
| 56 | -# define TTYNAME(_f) "true" |
| 57 | +# define TTYNAME(_f) DEFAULT_TTYNAME |
| 58 | #endif |
| 59 | |
| 60 | |
| 61 | -- |
| 62 | 1.9.1 |
| 63 | |