diff options
| author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-04 22:42:06 +0000 |
|---|---|---|
| committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-04 22:42:06 +0000 |
| commit | 292fc6d4a0dfd44279865a150a4fc44f9ab7bc83 (patch) | |
| tree | 95b540fefb7da61c57481442d76186c254e54c2d | |
| parent | 89588b6317d0acfe65ab48151de934445b1c8e10 (diff) | |
| download | ruby-292fc6d4a0dfd44279865a150a4fc44f9ab7bc83.tar.gz ruby-292fc6d4a0dfd44279865a150a4fc44f9ab7bc83.tar.xz ruby-292fc6d4a0dfd44279865a150a4fc44f9ab7bc83.zip | |
* 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
| -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): entry 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 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 } |