diff --git a/lib/fluent/msgpack_factory.rb b/lib/fluent/msgpack_factory.rb index 0d0c0ff01a..264dc852cd 100644 --- a/lib/fluent/msgpack_factory.rb +++ b/lib/fluent/msgpack_factory.rb @@ -96,7 +96,11 @@ def self.init(enable_time_support: false) end def self.thread_local_msgpack_packer - Thread.current[:local_msgpack_packer] ||= MessagePackFactory.engine_factory.packer + packer = Thread.current[:local_msgpack_packer] ||= MessagePackFactory.engine_factory.packer + # Discard bytes left by a write that raised. + # Use #clear because #reset needs msgpack 1.4.5 or later. + packer.clear + packer end def self.thread_local_msgpack_unpacker diff --git a/test/test_msgpack_factory.rb b/test/test_msgpack_factory.rb index ba9909590d..ab72eff8e0 100644 --- a/test/test_msgpack_factory.rb +++ b/test/test_msgpack_factory.rb @@ -22,6 +22,16 @@ class MessagePackFactoryTest < Test::Unit::TestCase packer2 = Fluent::MessagePackFactory.thread_local_msgpack_packer assert_equal packer1, packer2 end + + test 'clear the internal buffer of packer every time' do + packer1 = Fluent::MessagePackFactory.thread_local_msgpack_packer + assert_raise(RangeError) do + packer1.write([1, {"big" => 2**64}]) + end + + packer2 = Fluent::MessagePackFactory.thread_local_msgpack_packer + assert_equal [1, {"user" => "other"}], MessagePack.unpack(packer2.write([1, {"user" => "other"}]).full_pack) + end end sub_test_case 'thread_local_msgpack_unpacker' do