yugui	2009-02-22 18:47:41 +0900 (Sun, 22 Feb 2009)

  New Revision: 22513

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22513

  Log:
    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

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/readline/readline.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22512)
+++ ruby_1_9_1/ChangeLog	(revision 22513)
@@ -1,3 +1,8 @@
+Thu Feb  5 07:39:33 2009  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* 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@r...>
 
 	* time.c (LOCALTIME): should call tzset() before localtime_r().
Index: ruby_1_9_1/ext/readline/readline.c
===================================================================
--- ruby_1_9_1/ext/readline/readline.c	(revision 22512)
+++ ruby_1_9_1/ext/readline/readline.c	(revision 22513)
@@ -1287,8 +1287,10 @@
 #else
 	{
 	    HIST_ENTRY *entry = remove_history(0);
-	    free((char *)entry->line);
-	    free(entry);
+	    if (entry) {
+		free((char *)entry->line);
+		free(entry);
+	    }
 	}
 #endif
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/