aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwylandrea <wylandrea@gmail.com>2018-11-12 09:52:34 +0800
committerwylandrea <wylandrea@gmail.com>2018-11-13 20:27:37 +0800
commitb477c9613c784fdc8ade656673d27a2edf033276 (patch)
tree6cbc9fb555f7a94f96b92ef46fb5aa2975ac80ba
parent07b448c987619766da5c12235f3f693f3cd60209 (diff)
Fix: wrong dmm version match
Change-Id: I4419330db4cc6d9b6574d97e5a1ca22a605eb85b Signed-off-by: wylandrea <wylandrea@gmail.com>
-rw-r--r--src/nSocket/nstack/nstack.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/src/nSocket/nstack/nstack.c b/src/nSocket/nstack/nstack.c
index 225c297..9d6a2ba 100644
--- a/src/nSocket/nstack/nstack.c
+++ b/src/nSocket/nstack/nstack.c
@@ -285,44 +285,8 @@ match_version (char *nstack_ver, char *my_ver)
return 0;
}
- char *nstack_ver_head = NULL;
- char *my_ver_head = NULL;
- char nstack_version[NSTACK_VERSION_LEN] = { 0 };
- char my_version[NSTACK_VERSION_LEN] = { 0 };
-
- // !!!STRTOK_S will modify the original string, so use use temp for parameter
- /* use STRCPY_S instead of MEMCPY_S to avoid invalid memory visit */
- if (EOK != STRCPY_S (nstack_version, sizeof (nstack_version), nstack_ver))
- {
- return 0;
- }
-
- nstack_ver_head = get_ver_head (nstack_version);
- if (NULL == nstack_ver_head)
- {
- return 0;
- }
-
- /*use STRCPY_S instead of MEMCPY_S to avoid invalid memory visit */
- if (EOK != STRCPY_S (my_version, sizeof (my_version), my_ver))
- {
- return 0;
- }
-
- my_ver_head = get_ver_head (my_version);
- if (NULL == my_ver_head)
- {
- return 0;
- }
-
- if (strlen (my_ver_head) != strlen (nstack_ver_head))
- {
- return 0;
- }
-
-
- if (0 != strncmp (nstack_ver_head, my_ver_head, strlen (nstack_ver_head)))
+ if (0 != strncmp (nstack_ver, my_ver, 5))
{
return 0;
}