diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-10-16 05:37:09 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-10-16 05:37:09 +0300 |
| commit | 598630d323cad5d3acb69cfba3b296b18ccbecf1 (patch) | |
| tree | 385ea49e2294a0a6f3e8f8032479385bacc05243 | |
| parent | a7fd49bcce48fdda13d635d9b6f946c11abae35b (diff) | |
| parent | 2c76d05179339ca7100c0e5649dd2e0d50a0cb4c (diff) | |
| download | egawk-598630d323cad5d3acb69cfba3b296b18ccbecf1.tar.gz egawk-598630d323cad5d3acb69cfba3b296b18ccbecf1.tar.bz2 egawk-598630d323cad5d3acb69cfba3b296b18ccbecf1.zip | |
Merge branch 'gawk-4.1-stable'
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | m4/ChangeLog | 6 | ||||
| -rw-r--r-- | m4/readline.m4 | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -10437,7 +10437,8 @@ int main(int argc, char **argv) dup(fd); line = readline("giveittome> "); - printf("got <%s>\n", line); + /* some printfs don't handle NULL for %s */ + printf("got <%s>\n", line ? line : "(NULL)"); return 0; } _ACEOF diff --git a/m4/ChangeLog b/m4/ChangeLog index 3996eb53..9e2c279b 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2013-10-16 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Add check for NULL return from readline() in + call to printf() for results. Thanks to Dagobert Michelsen + <dam@opencsw.org> for the report. + 2013-08-29 Arnold D. Robbins <arnold@skeeve.com> * readline.m4: Add additional code to check for history_list() diff --git a/m4/readline.m4 b/m4/readline.m4 index f24e95bf..af2745db 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -53,7 +53,8 @@ int main(int argc, char **argv) dup(fd); line = readline("giveittome> "); - printf("got <%s>\n", line); + /* some printfs don't handle NULL for %s */ + printf("got <%s>\n", line ? line : "(NULL)"); return 0; }]]), dnl action if true: |