archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merges r30540 and r30541 from trunk into ruby_1_9_2.

Browse source 
--
* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-16 12:35:32 +00:00
parent 849e45dee8
commit c303d3838b
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Jan 14 13:38:58 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 Jan 14 07:30:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 14 07:30:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_next_argv): go advance when the next file cannot be * io.c (argf_next_argv): go advance when the next file cannot be

2
ext/zlib/zlib.c
View file

@ -2106,7 +2106,7 @@ gzfile_check_footer(struct gzfile *gz)
if (gz->crc != crc) { if (gz->crc != crc) {
rb_raise(cCRCError, "invalid compressed data -- crc error"); 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"); rb_raise(cLengthError, "invalid compressed data -- length error");
} }
} }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 155 #define RUBY_PATCHLEVEL 156
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1