Repository: hadoop Updated Branches: refs/heads/HDFS-8707 8d215aabc -> eca19c154
HDFS-9791: libhdfs+_+: ConfigurationLoader throws parse_exception on invalid input. Contributed by Bob Hansen. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eca19c15 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eca19c15 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eca19c15 Branch: refs/heads/HDFS-8707 Commit: eca19c154c4a42ee14a10271d59b9306a32221b4 Parents: 8d215aa Author: Bob Hansen <[email protected]> Authored: Mon Feb 29 13:40:28 2016 -0500 Committer: Bob Hansen <[email protected]> Committed: Mon Feb 29 13:40:28 2016 -0500 ---------------------------------------------------------------------- .../lib/common/configuration_loader.cc | 67 +++++++++++--------- 1 file changed, 36 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eca19c15/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/configuration_loader.cc ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/configuration_loader.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/configuration_loader.cc index 1ffb773..9bcf7e4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/configuration_loader.cc +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/configuration_loader.cc @@ -185,45 +185,50 @@ bool ConfigurationLoader::UpdateMapWithString(ConfigMap & map, bool ConfigurationLoader::UpdateMapWithBytes(ConfigMap& map, std::vector<char>& raw_bytes) { - rapidxml::xml_document<> dom; - dom.parse<rapidxml::parse_trim_whitespace>(&raw_bytes[0]); + try { + rapidxml::xml_document<> dom; + dom.parse<rapidxml::parse_trim_whitespace>(&raw_bytes[0]); - /* File must contain a single <configuration> stanza */ - auto config_node = dom.first_node("configuration", 0, false); - if (!config_node) { - return false; - } + /* File must contain a single <configuration> stanza */ + auto config_node = dom.first_node("configuration", 0, false); + if (!config_node) { + return false; + } - /* Walk all of the <property> nodes, ignoring the rest */ - for (auto property_node = config_node->first_node("property", 0, false); - property_node; - property_node = property_node->next_sibling("property", 0, false)) { - auto name_node = property_node->first_node("name", 0, false); - auto value_node = property_node->first_node("value", 0, false); - - if (name_node && value_node) { - std::string final_value; - auto final_node = property_node->first_node("final", 0, false); - if (final_node) { - final_value = final_node->value(); + /* Walk all of the <property> nodes, ignoring the rest */ + for (auto property_node = config_node->first_node("property", 0, false); + property_node; + property_node = property_node->next_sibling("property", 0, false)) { + auto name_node = property_node->first_node("name", 0, false); + auto value_node = property_node->first_node("value", 0, false); + + if (name_node && value_node) { + std::string final_value; + auto final_node = property_node->first_node("final", 0, false); + if (final_node) { + final_value = final_node->value(); + } + UpdateMapWithValue(map, name_node->value(), value_node->value(), final_value); } - UpdateMapWithValue(map, name_node->value(), value_node->value(), final_value); - } - auto name_attr = property_node->first_attribute("name", 0, false); - auto value_attr = property_node->first_attribute("value", 0, false); + auto name_attr = property_node->first_attribute("name", 0, false); + auto value_attr = property_node->first_attribute("value", 0, false); - if (name_attr && value_attr) { - std::string final_value; - auto final_attr = property_node->first_attribute("final", 0, false); - if (final_attr) { - final_value = final_attr->value(); + if (name_attr && value_attr) { + std::string final_value; + auto final_attr = property_node->first_attribute("final", 0, false); + if (final_attr) { + final_value = final_attr->value(); + } + UpdateMapWithValue(map, name_attr->value(), value_attr->value(), final_value); } - UpdateMapWithValue(map, name_attr->value(), value_attr->value(), final_value); } - } - return true; + return true; + } catch (const rapidxml::parse_error &e) { + // TODO: Capture the result in a Status object + return false; + } } bool ConfigurationLoader::UpdateMapWithValue(ConfigMap& map,
