summaryrefslogtreecommitdiffstats
path: root/ext
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
commit2da49bb6a64e84b57228ff34c76324b0fe6e6885 (patch)
tree3b2fa2345f7c3e7620c1548b29af4d97ecabe6b8 /ext
parent56c72020da8284799822aa947abe26e183e1fe95 (diff)
downloadruby-2da49bb6a64e84b57228ff34c76324b0fe6e6885.tar.gz
ruby-2da49bb6a64e84b57228ff34c76324b0fe6e6885.tar.xz
ruby-2da49bb6a64e84b57228ff34c76324b0fe6e6885.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/branches/ruby_1_8@10589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-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 aa481ad71..af7e029d1 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -83,7 +83,9 @@ readline_readline(argc, argv, 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