Merge remote-tracking branch 'origin/develop' into feature/TD-1925_new

This commit is contained in:
Shengliang Guan 2021-01-25 08:31:23 +00:00
commit a7d53351d7
1 changed files with 2 additions and 2 deletions

View File

@ -775,7 +775,7 @@ int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool inclu
return -1;
}
} else {
wcsncpy((wchar_t *)p, pVariant->wpz, pVariant->nLen);
memcpy(p, pVariant->wpz, pVariant->nLen);
newlen = pVariant->nLen;
}
@ -867,4 +867,4 @@ int32_t tVariantTypeSetType(tVariant *pVariant, char type) {
}
return 0;
}
}