Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3012

Browse Source 
e4bbeff2 epee: check some error return values (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-01-25 16:36:27 -08:00
commit 9fff66f004
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/epee/include/storages/levin_abstract_invoke2.h
View File

@ -60,8 +60,7 @@ namespace epee
LOG_ERROR("Failed to load_from_binary on command " << command); LOG_ERROR("Failed to load_from_binary on command " << command);
return false; return false;
} }
result_struct.load(stg_ret); return result_struct.load(stg_ret);
return true;
} }
template<class t_arg, class t_transport> template<class t_arg, class t_transport>
@ -105,9 +104,7 @@ namespace epee
LOG_ERROR("Failed to load_from_binary on command " << command); LOG_ERROR("Failed to load_from_binary on command " << command);
return false; return false;
} }
result_struct.load(stg_ret); return result_struct.load(stg_ret);
return true;
} }
template<class t_result, class t_arg, class callback_t, class t_transport> template<class t_result, class t_arg, class callback_t, class t_transport>
@ -133,7 +130,12 @@ namespace epee
cb(LEVIN_ERROR_FORMAT, result_struct, context); cb(LEVIN_ERROR_FORMAT, result_struct, context);
return false; return false;
} }
result_struct.load(stg_ret); if (!result_struct.load(stg_ret))
{
LOG_ERROR("Failed to load result struct on command " << command);
cb(LEVIN_ERROR_FORMAT, result_struct, context);
return false;
}
cb(code, result_struct, context); cb(code, result_struct, context);
return true; return true;
}, inv_timeout); }, inv_timeout);
@ -176,7 +178,11 @@ namespace epee
boost::value_initialized<t_in_type> in_struct; boost::value_initialized<t_in_type> in_struct;
boost::value_initialized<t_out_type> out_struct; boost::value_initialized<t_out_type> out_struct;
static_cast<t_in_type&>(in_struct).load(strg); if (!static_cast<t_in_type&>(in_struct).load(strg))
{
LOG_ERROR("Failed to load in_struct in command " << command);
return -1;
}
int res = cb(command, static_cast<t_in_type&>(in_struct), static_cast<t_out_type&>(out_struct), context); int res = cb(command, static_cast<t_in_type&>(in_struct), static_cast<t_out_type&>(out_struct), context);
serialization::portable_storage strg_out; serialization::portable_storage strg_out;
static_cast<t_out_type&>(out_struct).store(strg_out); static_cast<t_out_type&>(out_struct).store(strg_out);
@ -200,7 +206,11 @@ namespace epee
return -1; return -1;
} }
boost::value_initialized<t_in_type> in_struct; boost::value_initialized<t_in_type> in_struct;
static_cast<t_in_type&>(in_struct).load(strg); if (!static_cast<t_in_type&>(in_struct).load(strg))
{
LOG_ERROR("Failed to load in_struct in notify " << command);
return -1;
}
return cb(command, in_struct, context); return cb(command, in_struct, context);
} }