Skip to content

verify seq_int resume value is not out of bounds #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slfritchie merged 1 commit into from
Apr 9, 2013
Merged

verify seq_int resume value is not out of bounds #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/basho_bench_keygen.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ sequential_int_generator(Ref, MaxValue, Id, DisableProgress) ->
%% dictionary to keep track of where we are.
case erlang:get({sigen, Ref}) of
undefined ->
seq_gen_put(Ref, seq_gen_read_resume_value(Id)),
seq_gen_put(Ref, seq_gen_read_resume_value(Id, MaxValue)),
sequential_int_generator(Ref, MaxValue, Id, DisableProgress);
MaxValue ->
throw({stop, empty_keygen});
Expand Down Expand Up @@ -158,7 +158,7 @@ seq_gen_write_resume_value(Id, Value) ->
ok = file:rename(OutFileTmp, OutFile)
end.

seq_gen_read_resume_value(Id) ->
seq_gen_read_resume_value(Id, MaxValue) ->
case seq_gen_state_dir(Id) of
"" ->
0;
Expand All @@ -167,8 +167,14 @@ seq_gen_read_resume_value(Id) ->
InFile = Path ++ "/" ++ integer_to_list(Id),
{ok, Bin} = file:read_file(InFile),
Value = binary_to_term(Bin),
?DEBUG("Id ~p resuming from value ~p\n", [Id, Value]),
Value
case Value > MaxValue of
true ->
?WARN("Id ~p resume value ~p exceeds maximum value ~p. Restarting from 0",[Id, Value, MaxValue]),
0;
false ->
?DEBUG("Id ~p resuming from value ~p\n", [Id, Value]),
Value
end
catch
error:{badmatch, _} ->
0;
Expand Down