summaryrefslogtreecommitdiffstats
path: root/ext/readline
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-24 06:55:26 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-24 06:55:26 +0000
commitff76ff8191e03142d99b1cdfc149b3b02634bd4f (patch)
treef89b8d79ad962fd9e749e1c16091045b4a03e61d /ext/readline
parentdc9dcec97ff44b9c7caf23fe6ea131a13f88aaaf (diff)
downloadruby-ff76ff8191e03142d99b1cdfc149b3b02634bd4f.tar.gz
ruby-ff76ff8191e03142d99b1cdfc149b3b02634bd4f.tar.xz
ruby-ff76ff8191e03142d99b1cdfc149b3b02634bd4f.zip
* ext/readline/readline.c (readline_readline): rl_deprep_term_function
may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/readline')
-rw-r--r--ext/readline/readline.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 626c0e0dc..f6dc6b67e 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -77,7 +77,9 @@ readline_readline(int argc, VALUE *argv, VALUE self)
rl_cleanup_after_signal();
#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
/* restore terminal mode */
- (*rl_deprep_term_function)();
+ if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
+ (*rl_deprep_term_function)();
+ else
#else
rl_deprep_terminal();
#endif