From 292fc6d4a0dfd44279865a150a4fc44f9ab7bc83 Mon Sep 17 00:00:00 2001 From: kazu Date: Wed, 4 Feb 2009 22:42:06 +0000 Subject: * ext/readline/readline.c (Init_readline): entry may be NULL. [ruby-dev:37891] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/readline/readline.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b379c32bb..9c22da974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 5 07:39:33 2009 Kazuhiro NISHIYAMA + + * ext/readline/readline.c (Init_readline): entry may be NULL. + [ruby-dev:37891] + Thu Feb 5 03:55:22 2009 Yukihiro Matsumoto * time.c (LOCALTIME): should call tzset() before localtime_r(). diff --git a/ext/readline/readline.c b/ext/readline/readline.c index a5dbe462e..d8f540e02 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1349,8 +1349,10 @@ Init_readline() #else { HIST_ENTRY *entry = remove_history(0); - free((char *)entry->line); - free(entry); + if (entry) { + free((char *)entry->line); + free(entry); + } } #endif } -- cgit