diff options
author | 2018-11-15 01:13:06 +0000 | |
---|---|---|
committer | 2018-11-15 01:13:06 +0000 | |
commit | 38ab17eba275f56868dd2c7ebb350e09cdd6c615 (patch) | |
tree | 1570b61baafb5431d8b288e1071966ab996d9777 /src/nSocket | |
parent | c44fe256a1f1812dc511697808c99dcc92d93068 (diff) | |
parent | b477c9613c784fdc8ade656673d27a2edf033276 (diff) |
Merge "Fix: wrong dmm version match"
Diffstat (limited to 'src/nSocket')
-rw-r--r-- | src/nSocket/nstack/nstack.c | 38 |
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; } |