diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 724bc188b3dac37e9ab4fba6ea64ebf107f9ed07..7a42602a2198d0642c11ed77d641414d80ef2f04 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -234,10 +234,9 @@ allocateCursor( */ Mem *pMem = iCur>0 ? &p->aMem[p->nMem-iCur] : p->aMem; - int nByte; VdbeCursor *pCx = 0; - nByte = - ROUND8(sizeof(VdbeCursor)) + sizeof(u32)*nField + + int bt_offset = ROUND8(sizeof(VdbeCursor) + sizeof(uint32_t) * nField); + int nByte = bt_offset + (eCurType==CURTYPE_TARANTOOL ? ROUND8(sizeof(BtCursor)) : 0); assert(iCur>=0 && iCur<p->nCursor); @@ -251,8 +250,7 @@ allocateCursor( pCx->eCurType = eCurType; pCx->nField = nField; if (eCurType==CURTYPE_TARANTOOL) { - pCx->uc.pCursor = (BtCursor*) - &pMem->z[ROUND8(sizeof(VdbeCursor))+sizeof(u32)*nField]; + pCx->uc.pCursor = (BtCursor*)&pMem->z[bt_offset]; sqlCursorZero(pCx->uc.pCursor); } }