From 71a800a5f352add937779872623e6880936699bf Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 22 Feb 2009 09:47:41 +0000
Subject: 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
---
 ext/readline/readline.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ext')

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
     }
-- 
cgit v1.2.3