generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-20 21:39:53 +01:00
Code Issues Projects Releases Wiki Activity

erlang: Fix incomplete/invalid cases of unpack_/1

Browse Source 
* fix list of invalid bytes was missing 3 possibilities (see type chart section of msgpack format spec)
* fix matching of invalid bytes to look at 1 byte instead of 2
* simplify 'incomplete' case : anything that's not complete or invalid is by definition incomplete
This commit is contained in:
Vincent de Phily 2010-07-09 13:29:47 +02:00
parent 64c36b7a8f
commit 6abc120279
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erlang/msgpack.erl
View File

@ -236,24 +236,15 @@ unpack_(Bin) ->
<<2#1001:4, L:4, Rest/binary>> -> unpack_array_(Rest, L, []); % array <<2#1001:4, L:4, Rest/binary>> -> unpack_array_(Rest, L, []); % array
<<2#1000:4, L:4, Rest/binary>> -> unpack_map_(Rest, L, []); % map <<2#1000:4, L:4, Rest/binary>> -> unpack_map_(Rest, L, []); % map
% Incomplete / invalid data % Invalid data
<<F:16, _/binary>> when F==16#CA; F==16#CB; F==16#CC; <<F, _/binary>> when F==16#C1;
F==16#CD; F==16#CE; F==16#CF; F==16#C4; F==16#C5; F==16#C6; F==16#C7; F==16#C8; F==16#C9;
F==16#D0; F==16#D1; F==16#D2; F==16#D4; F==16#D5; F==16#D6; F==16#D7; F==16#D8; F==16#D9 ->
F==16#D3; F==16#DA; F==16#DB;
F==16#DC; F==16#DD; F==16#DE;
F==16#DF ->
throw(short);
<<F:16, _/binary>> when F==16#C1;
F==16#C7; F==16#C8; F==16#C9;
F==16#D5; F==16#D6; F==16#D7;
F==16#D8; F==16#D9 ->
throw(badarg); throw(badarg);
% Incomplete data (we've covered every complete/invalid case; anything left is incomplete)
_ -> _ ->
throw(short) % or unknown/badarg? throw(short)
end; end.
unpack_(<<>>)-> throw(short);
unpack_(<<2#101:3, _/binary>>) -> throw(short).
% ===== test codes ===== % % ===== test codes ===== %
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").