Skip to content

Commit 663c3a3

Browse files
authored
Merge pull request #404 from OskarEichler/audit/consume-skip-nil
Consume cached nil in Unpacker#skip_nil
2 parents 8c429cd + 512b587 commit 663c3a3

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

‎ext/msgpack/unpacker.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,8 @@ int msgpack_unpacker_skip_nil(msgpack_unpacker_t* uk)
911911
return b;
912912
}
913913
if(b == 0xc0) {
914+
reset_head_byte(uk);
914915
return 1;
915916
}
916917
return 0;
917918
}
918-

‎spec/cruby/unpacker_spec.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
end
1212

1313
it 'skip_nil succeeds' do
14-
unpacker.feed("\xc0")
14+
unpacker.feed("\xc0*")
1515
unpacker.skip_nil.should == true
16+
unpacker.unpack.should == 42
1617
end
1718

1819
it 'skip_nil fails' do

0 commit comments

Comments
 (0)