Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

fix dreference of null

Browse source
This commit is contained in:
Daniel Larimer 2015-10-08 15:11:32 -04:00
parent eb1895ef55
commit 70fefe4f5f
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/chain/market_evaluator.cpp
View file

@ -225,15 +225,16 @@ void_result call_order_update_evaluator::do_apply(const call_order_update_operat
const auto call_obj = d.find(call_order_id); const auto call_obj = d.find(call_order_id);
// if we filled at least one call order, we are OK if we totally filled. // if we filled at least one call order, we are OK if we totally filled.
GRAPHENE_ASSERT( GRAPHENE_ASSERT(
!d.find_object( call_order_id ), !call_obj,
call_order_update_unfilled_margin_call, call_order_update_unfilled_margin_call,
"Updating call order would trigger a margin call that cannot be fully filled", "Updating call order would trigger a margin call that cannot be fully filled",
("a", call_obj ? ~call_obj->call_price : price())("b", _bitasset_data->current_feed.settlement_price) ("a", ~call_obj->call_price )("b", _bitasset_data->current_feed.settlement_price)
); );
} }
else else
{ {
const auto call_obj = d.find(call_order_id); const auto call_obj = d.find(call_order_id);
FC_ASSERT( call_obj, "no margin call was executed and yet the call object was deleted" );
//edump( (~call_obj->call_price) ("<")( _bitasset_data->current_feed.settlement_price) ); //edump( (~call_obj->call_price) ("<")( _bitasset_data->current_feed.settlement_price) );
// We didn't fill any call orders. This may be because we // We didn't fill any call orders. This may be because we
// aren't in margin call territory, or it may be because there // aren't in margin call territory, or it may be because there
@ -242,7 +243,7 @@ void_result call_order_update_evaluator::do_apply(const call_order_update_operat
~call_obj->call_price < _bitasset_data->current_feed.settlement_price, ~call_obj->call_price < _bitasset_data->current_feed.settlement_price,
call_order_update_unfilled_margin_call, call_order_update_unfilled_margin_call,
"Updating call order would trigger a margin call that cannot be fully filled", "Updating call order would trigger a margin call that cannot be fully filled",
("a",call_obj ? ~call_obj->call_price : price())("b", _bitasset_data->current_feed.settlement_price) ("a", ~call_obj->call_price )("b", _bitasset_data->current_feed.settlement_price)
); );
} }
} }

2
libraries/fc

@ -1 +1 @@
Subproject commit dacdb997f885d837c48ea3d8f8fa57cb27a82c23 Subproject commit 2b2dfc62fcf40e88f62c187ddbe709bf51bcef4f