shyouhei	2010-06-07 19:45:46 +0900 (Mon, 07 Jun 2010)

  New Revision: 28195

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

  Log:
    merge revision(s) 26903:
    * ext/nkf/nkf-utf8/nkf.c (numchar_getc): get rid of buffer
      overflow.  [ruby-dev:40606]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c
    branches/ruby_1_8_7/test/nkf/test_nkf.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c	(revision 28194)
+++ ruby_1_8_7/ext/nkf/nkf-utf8/nkf.c	(revision 28195)
@@ -5004,7 +5004,7 @@
     nkf_char (*g)(FILE *) = i_ngetc;
     nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
     int i = 0, j;
-    nkf_char buf[8];
+    nkf_char buf[10];
     long c = -1;
 
     buf[i] = (*g)(f);
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28194)
+++ ruby_1_8_7/ChangeLog	(revision 28195)
@@ -1,3 +1,8 @@
+Mon Jun  7 19:23:04 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c (numchar_getc): get rid of buffer
+	  overflow.  [ruby-dev:40606]
+
 Mon Jun  7 18:57:02 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* ext/openssl/ossl_ssl_session.c
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28194)
+++ ruby_1_8_7/version.h	(revision 28195)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-07"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100607
-#define RUBY_PATCHLEVEL 267
+#define RUBY_PATCHLEVEL 268
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/nkf/test_nkf.rb
===================================================================
--- ruby_1_8_7/test/nkf/test_nkf.rb	(revision 28194)
+++ ruby_1_8_7/test/nkf/test_nkf.rb	(revision 28195)
@@ -13,4 +13,9 @@
     assert_equal(::NKF::EUC, NKF.guess(str_euc))
   end
 
+  def test_numchar_input
+    bug2953 = '[ruby-dev:40606]'
+    assert_equal("A", NKF.nkf("-w --numchar-input", "&#x000041;"), bug2953)
+    assert_equal("B", NKF.nkf("-w --numchar-input", "&#0000066;"), bug2953)
+  end
 end

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