Merge "ipacm: Add Low RAM flag before compilation"
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 11c371c..3447207 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -1897,10 +1897,13 @@
IPACM_Wan::xlat_mux_id = 0;
wanup_data->xlat_mux_id = 0;
if(m_is_sta_mode != WLAN_WAN) //both q6_wan/q6_mhi_wan
+ {
wanup_data->mux_id = ext_prop->ext[0].mux_id;
+ IPACMDBG_H("mux_id: %d\n", wanup_data->mux_id);
+ }
else
wanup_data->mux_id = 0;
- IPACMDBG_H("No xlat configuration mux-id %d %d\n", ext_prop->ext[0].mux_id, wanup_data->mux_id);
+ IPACMDBG_H("No xlat configuration\n");
}
evt_data.event = IPA_HANDLE_WAN_UP;
evt_data.evt_data = (void *)wanup_data;
diff --git a/ipacm/src/IPACM_Xml.cpp b/ipacm/src/IPACM_Xml.cpp
index 4451906..d59bbb0 100644
--- a/ipacm/src/IPACM_Xml.cpp
+++ b/ipacm/src/IPACM_Xml.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013, The Linux Foundation. All rights reserved.
+Copyright (c) 2013, 2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -75,6 +75,7 @@
)
{
xmlNode* child_ptr;
+ uint32_t str_len;
for (child_ptr = element->children;
child_ptr != NULL;
@@ -82,7 +83,15 @@
{
if (child_ptr->type == XML_TEXT_NODE)
{
- return (char*)child_ptr->content;
+ str_len = strlen((char*)child_ptr->content);
+
+ if(str_len < MAX_XML_STR_LEN)
+ return (char*)child_ptr->content;
+ else
+ {
+ IPACMERR("Invalid string size\n");
+ break;
+ }
}
}
return NULL;