Skip to content
Browse files

merge revision(s) 30552:

?\012
* 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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@31662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 62841fa commit cba9b5f6e981e84689b3cd0da0306d7870691a31 @shyouhei shyouhei committed May 20, 2011
Showing with 8 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 ext/zlib/zlib.c
  3. +1 −1 version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Sat May 21 00:55:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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 May 20 23:46:44 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
View
2 ext/zlib/zlib.c
@@ -2090,7 +2090,7 @@ gzfile_check_footer(gz)
if (gz->crc != crc) {
rb_raise(cCRCError, "invalid compressed data -- crc error");
}
- if (gz->z.stream.total_out != length) {
+ if ((gz->z.stream.total_out & 0xFFFFFFFFUL) != length) {
rb_raise(cLengthError, "invalid compressed data -- length error");
}
}
View
2 version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2011-05-21"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 338
+#define RUBY_PATCHLEVEL 339
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8

0 comments on commit cba9b5f

Please sign in to comment.
Something went wrong with that request. Please try again.