xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[td-1373]

This commit is contained in:
Haojun Liao 2020-10-23 12:55:43 +08:00
parent 7582b7e4df
commit 22a6c4f13c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/src/tvariant.c
View File

@ -147,15 +147,20 @@ void tVariantAssign(tVariant *pDst, const tVariant *pSrc) {
*pDst = *pSrc; *pDst = *pSrc;
if (pSrc->nType == TSDB_DATA_TYPE_BINARY || pSrc->nType == TSDB_DATA_TYPE_NCHAR) { if (pSrc->nType == TSDB_DATA_TYPE_BINARY || pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
int32_t len = pSrc->nLen + 1; int32_t allocLen = pSrc->nLen + 1;
int32_t len = pSrc->nLen;
if (pSrc->nType == TSDB_DATA_TYPE_NCHAR) { if (pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
allocLen = allocLen * TSDB_NCHAR_SIZE;
len = len * TSDB_NCHAR_SIZE; len = len * TSDB_NCHAR_SIZE;
} }
char* p = realloc(pDst->pz, len); char* p = realloc(pDst->pz, allocLen);
assert(p); assert(p);
memset(pDst->pz, 0, len); memset(p, 0, allocLen);
pDst->pz = p;
memcpy(pDst->pz, pSrc->pz, len); memcpy(pDst->pz, pSrc->pz, len);
return; return;
} }