[前][次][番号順一覧][スレッド一覧]

ruby-changes:18517

From: naruse <ko1@a...>
Date: Fri, 14 Jan 2011 13:56:24 +0900 (JST)
Subject: [ruby-changes:18517] Ruby:r30540 (trunk): * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in

naruse	2011-01-14 13:51:34 +0900 (Fri, 14 Jan 2011)

  New Revision: 30540

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

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

  Modified files:
    trunk/ChangeLog
    trunk/ext/zlib/zlib.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30539)
+++ ChangeLog	(revision 30540)
@@ -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 11:36:25 2011  NAKAMURA Usaku  <usa@r...>
 
 	* configure.in, win32/Makefile.sub (RUNRUBY): require path should
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c	(revision 30539)
+++ ext/zlib/zlib.c	(revision 30540)
@@ -2169,7 +2169,7 @@
     if (gz->crc != crc) {
 	rb_raise(cCRCError, "invalid compressed data -- crc error");
     }
-    if (gz->z.stream.total_out != length) {
+    if ((int32_t)gz->z.stream.total_out != length) {
 	rb_raise(cLengthError, "invalid compressed data -- length error");
     }
 }

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

[前][次][番号順一覧][スレッド一覧]