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 | df422f40fdc37c9e7f243f59260db6a7a2ef884e (patch) | |
| tree | 7691e3eb49a0f7708eccbfb2e5f73c59de5f1098 /ext/readline | |
| parent | 12d893c72c1fa220bed44b59f68c80f58fbbca69 (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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/readline')
| -rw-r--r-- | ext/readline/readline.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 7912989c2..124609cf5 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 } |