[td-255] merge develop.
This commit is contained in:
parent
f86ab16b87
commit
626cd4cc58
|
@ -3618,6 +3618,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
|
|||
|
||||
pNew->pTscObj = pSql->pTscObj;
|
||||
pNew->signature = pNew;
|
||||
pNew->sqlstr = strdup(pSql->sqlstr);
|
||||
tsem_init(&pNew->rspSem, 0, 0);
|
||||
|
||||
SSqlCmd* pnCmd = &pNew->cmd;
|
||||
|
|
|
@ -24,11 +24,12 @@ void* taosArrayInit(size_t size, size_t elemSize) {
|
|||
size = TARRAY_MIN_SIZE;
|
||||
}
|
||||
|
||||
SArray* pArray = calloc(1, sizeof(SArray));
|
||||
SArray* pArray = malloc(sizeof(SArray));
|
||||
if (pArray == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pArray->size = 0;
|
||||
pArray->pData = calloc(size, elemSize);
|
||||
if (pArray->pData == NULL) {
|
||||
free(pArray);
|
||||
|
|
Loading…
Reference in New Issue