ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpt_write: fix pointer to local variable

Browse Source 
This problem surfaced with the new tool chain that changes the stack
layout. A pointer to the the config XML data was kept in the main object
but pointed to a stack variable. This patch fixes it by removing the
pointer.

Fixes #3416
This commit is contained in:
Norman Feske 2019-06-24 11:14:57 +02:00 committed by Christian Helmuth
parent 63e69d35e0
commit 716453aaa1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
repos/gems/src/app/gpt_write/main.cc
View File

@ -61,8 +61,6 @@ struct Gpt::Writer
Util::Number_of_bytes _entry_alignment { 4096u };
Genode::Xml_node *_config { nullptr };
void _handle_config(Genode::Xml_node config)
{
_verbose = config.attribute_value("verbose", false);
@ -83,8 +81,6 @@ struct Gpt::Writer
if (_wipe && (_initialize || commands)) {
Genode::warning("will exit after wiping");
}
_config = &config;
}
/************
@ -692,15 +688,13 @@ struct Gpt::Writer
* \return true if actions were executed successfully, otherwise
* false
*/
bool execute_actions()
bool execute_actions(Genode::Xml_node actions)
{
if (_wipe) { return _wipe_tables(); }
if (_initialize) { _initialize_tables(); }
try {
Genode::Xml_node actions = _config->sub_node("actions");
actions.for_each_sub_node([&] (Genode::Xml_node node) {
bool result = false;
@ -750,14 +744,19 @@ struct Main
Util::init_random(_heap);
Genode::Xml_node const config = _config_rom.xml();
try {
_writer.construct(_block, _config_rom.xml());
_writer.construct(_block, config);
} catch (...) {
_env.parent().exit(1);
return;
}
bool const success = _writer->execute_actions();
bool success = false;
config.with_sub_node("actions", [&] (Genode::Xml_node actions) {
success = _writer->execute_actions(actions); });
_env.parent().exit(success ? 0 : 1);
}
};