yugui	2011-01-16 21:35:32 +0900 (Sun, 16 Jan 2011)

  New Revision: 30575

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

  Log:
    merges r30540 and r30541 from trunk into ruby_1_9_2.
    --
    * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
      gzip's header is the size of uncompressed input data modulo 2^32.
      [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
    --
    The cast must use uint32_t. [ruby-core:34481]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/zlib/zlib.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30574)
+++ ruby_1_9_2/ChangeLog	(revision 30575)
@@ -1,3 +1,9 @@
+Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@r...>
+
+	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
+	  gzip's header is the size of uncompressed input data modulo 2^32.
+	  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
+
 Fri Jan 14 07:30:47 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (argf_next_argv): go advance when the next file cannot be
Index: ruby_1_9_2/ext/zlib/zlib.c
===================================================================
--- ruby_1_9_2/ext/zlib/zlib.c	(revision 30574)
+++ ruby_1_9_2/ext/zlib/zlib.c	(revision 30575)
@@ -2106,7 +2106,7 @@
     if (gz->crc != crc) {
 	rb_raise(cCRCError, "invalid compressed data -- crc error");
     }
-    if (gz->z.stream.total_out != length) {
+    if ((uint32_t)gz->z.stream.total_out != length) {
 	rb_raise(cLengthError, "invalid compressed data -- length error");
     }
 }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30574)
+++ ruby_1_9_2/version.h	(revision 30575)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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