github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 21:47:22 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix reference parameter to procedure is reassigned

Browse Source 
Reassign reference parameter may lead to possibly serious errors
and unmaintainability. This patch wants to fix this by avoiding
do this.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-12-06 22:16:23 +08:00 committed by wenlingz
parent 36be890ee6
commit f33edc67fe
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hypervisor/lib/string.c
View File

@ -427,6 +427,7 @@ char *strstr_s(const char *str1, size_t maxlen1, const char *str2, size_t maxlen
{ {
size_t len1, len2; size_t len1, len2;
size_t i; size_t i;
const char *pstr;
if ((str1 == NULL) || (str2 == NULL)) { if ((str1 == NULL) || (str2 == NULL)) {
return NULL; return NULL;
@ -439,28 +440,26 @@ char *strstr_s(const char *str1, size_t maxlen1, const char *str2, size_t maxlen
len1 = strnlen_s(str1, maxlen1); len1 = strnlen_s(str1, maxlen1);
len2 = strnlen_s(str2, maxlen2); len2 = strnlen_s(str2, maxlen2);
if (len1 == 0U) { if (len1 < len2) {
return NULL; return NULL;
} }
/* /* return str1 if str2 equals to str1 or str2 points to a string with zero length*/
* str2 points to a string with zero length, or if ((str1 == str2) || (len2 == 0U)) {
* str2 equals str1, return str1
*/
if (len2 == 0U || str1 == str2) {
return (char *)str1; return (char *)str1;
} }
pstr = str1;
while (len1 >= len2) { while (len1 >= len2) {
for (i = 0U; i < len2; i++) { for (i = 0U; i < len2; i++) {
if (str1[i] != str2[i]) { if (pstr[i] != str2[i]) {
break; break;
} }
} }
if (i == len2) { if (i == len2) {
return (char *)str1; return (char *)pstr;
} }
str1++; pstr++;
len1--; len1--;
} }