diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2017-01-30 22:50:49 +0000 |
|---|---|---|
| committer | davidevinavil <davidevinavil@gmail.com> | 2017-01-31 18:43:48 +0100 |
| commit | 4c0cac030564e37e8430b5c839d526d0efbbbc4b (patch) | |
| tree | 8c52905150e7add99b11b15211166c62d16d9bec | |
| parent | 4dbccc297fdd3157808ddf312dec8dc24583a2f7 (diff) | |
z2_plus: Sync IPACM with upstream
* Tag: LA.UM.5.5.r1-02500-8x96.0
Change-Id: Ibb3d7542ee3369a752ad1a79a3b8324445d6649a
| -rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp | 2 | ||||
| -rw-r--r-- | data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp index d8c4227..0decd1b 100644 --- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp +++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Config.cpp @@ -482,7 +482,7 @@ int IPACM_Config::AddNatIfaces(char *dev_name) if (ipa_nat_iface_entries < ipa_num_ipa_interfaces) { - memcpy(pNatIfaces[ipa_nat_iface_entries - 1].iface_name, + strlcpy(pNatIfaces[ipa_nat_iface_entries - 1].iface_name, dev_name, IPA_IFACE_NAME_LEN); IPACMDBG_H("Add Nat IfaceName: %s ,update nat-ifaces number: %d\n", diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp index 073dc98..120a638 100644 --- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp +++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp @@ -267,8 +267,8 @@ static int ipacm_cfg_xml_parse_tree { str_size = strlen(content); memset(content_buf, 0, sizeof(content_buf)); - memcpy(content_buf, (void *)content, str_size); - strlcpy(config->iface_config.iface_entries[config->iface_config.num_iface_entries - 1].iface_name, content_buf, str_size+1); + strlcpy(content_buf, content, MAX_XML_STR_LEN); + strlcpy(config->iface_config.iface_entries[config->iface_config.num_iface_entries - 1].iface_name, content_buf, IPA_IFACE_NAME_LEN); IPACMDBG_H("Name %s\n", config->iface_config.iface_entries[config->iface_config.num_iface_entries - 1].iface_name); } } |