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 16:24:00 +08:00
parent 30642fa1c6
commit a89368e6b6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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