diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 09:47:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 09:47:41 +0000 |
| commit | 71a800a5f352add937779872623e6880936699bf (patch) | |
| tree | 7691e3eb49a0f7708eccbfb2e5f73c59de5f1098 | |
| parent | 083d726b86ca35553cc3e8439b9cd3d9cd645586 (diff) | |
merges r22054 and r22055 from trunk into ruby_1_9_1.
* ext/readline/readline.c (Init_readline): entry may be NULL.
[ruby-dev:37891]
--
change from assigned variable to called function
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/readline/readline.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Feb 5 07:39:33 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * ext/readline/readline.c (Init_readline): remove_history(0) may be + NULL. [ruby-dev:37891] + Thu Feb 5 03:55:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * time.c (LOCALTIME): should call tzset() before localtime_r(). diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 7912989c21..124609cf57 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1287,8 +1287,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 } |