[ruby-cvs:66985] nagachika:r59807 (ruby_2_4): merge revision(s) 58524, 58525, 58526, 59333, 59337: [Backport #13616]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Sun Sep 10 11:40:45 JST 2017


nagachika	2017-09-10 11:40:45 +0900 (Sun, 10 Sep 2017)

  New Revision: 59807

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59807

  Log:
    merge revision(s) 58524,58525,58526,59333,59337: [Backport #13616]
    
    zlib.c: zstream_expand_buffer_non_stream
    
    * ext/zlib/zlib.c (zstream_expand_buffer_non_stream): rename from
      zstream_expand_buffer_without_gvl() and replace duplicate code
      in zstream_expand_buffer().
    zlib.c: zstream_buffer_ungetbyte
    
    * ext/zlib/zlib.c (zstream_buffer_ungetbyte): simplify by using
      zstream_buffer_ungets().
    zlib.c: no buf_filled in zstream
    
    * ext/zlib/zlib.c (zstream): manage capacity and size of `buf`
      instead of size and separated member `buf_filled`.  reported by
      Christian Jalio (jalio) at https://hackerone.com/reports/211958
    Zlib::GzipReader#pos underflows after calling #ungetbyte or #ungetc at start of file [Bug #13616]
    
    patched by Andrew Haines <andrew at haines.org.nz> [ruby-core:81488]
    zlib.c: fix unnormalized Fixnum
    
    * ext/zlib/zlib.c (rb_gzfile_total_out): cast to long not to
      result in an unsigned long to normalized to Fixnum on LLP64
      platforms.  [ruby-core:81488]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/ext/zlib/zlib.c
    branches/ruby_2_4/test/zlib/test_zlib.rb
    branches/ruby_2_4/version.h


More information about the ruby-cvs mailing list