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

fix: column length check for stmt insert

This commit is contained in:
kailixu 2024-09-20 18:40:59 +08:00
parent 689608b147
commit e9f61672c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/common/src/tdataformat.c
View File

@ -115,7 +115,7 @@ static FORCE_INLINE int32_t tRowBuildScanAddNull(SRowBuildScanInfo *sinfo, const
return 0; return 0;
} }
static FORCE_INLINE void tRowBuildScanAddValue(SRowBuildScanInfo *sinfo, SColVal *colVal, const STColumn *pTColumn) { static FORCE_INLINE int32_t tRowBuildScanAddValue(SRowBuildScanInfo *sinfo, SColVal *colVal, const STColumn *pTColumn) {
bool isPK = ((pTColumn->flags & COL_IS_KEY) != 0); bool isPK = ((pTColumn->flags & COL_IS_KEY) != 0);
if (isPK) { if (isPK) {
@ -129,6 +129,8 @@ static FORCE_INLINE void tRowBuildScanAddValue(SRowBuildScanInfo *sinfo, SColVal
sinfo->kvMaxOffset = sinfo->kvPayloadSize; sinfo->kvMaxOffset = sinfo->kvPayloadSize;
if (IS_VAR_DATA_TYPE(colVal->value.type)) { if (IS_VAR_DATA_TYPE(colVal->value.type)) {
if (colVal->value.nData > pTColumn->bytes) return TSDB_CODE_INVALID_PARA;
sinfo->tupleVarSize += tPutU32v(NULL, colVal->value.nData) // size sinfo->tupleVarSize += tPutU32v(NULL, colVal->value.nData) // size
+ colVal->value.nData; // value + colVal->value.nData; // value
@ -140,6 +142,7 @@ static FORCE_INLINE void tRowBuildScanAddValue(SRowBuildScanInfo *sinfo, SColVal
+ tDataTypes[colVal->value.type].bytes; // value + tDataTypes[colVal->value.type].bytes; // value
} }
sinfo->numOfValue++; sinfo->numOfValue++;
return 0;
} }
static int32_t tRowBuildScan(SArray *colVals, const STSchema *schema, SRowBuildScanInfo *sinfo) { static int32_t tRowBuildScan(SArray *colVals, const STSchema *schema, SRowBuildScanInfo *sinfo) {
@ -177,7 +180,7 @@ static int32_t tRowBuildScan(SArray *colVals, const STSchema *schema, SRowBuildS
} }
if (COL_VAL_IS_VALUE(&colValArray[colValIndex])) { if (COL_VAL_IS_VALUE(&colValArray[colValIndex])) {
tRowBuildScanAddValue(sinfo, &colValArray[colValIndex], schema->columns + i); if ((code = tRowBuildScanAddValue(sinfo, &colValArray[colValIndex], schema->columns + i))) goto _exit;
} else if (COL_VAL_IS_NULL(&colValArray[colValIndex])) { } else if (COL_VAL_IS_NULL(&colValArray[colValIndex])) {
if ((code = tRowBuildScanAddNull(sinfo, schema->columns + i))) goto _exit; if ((code = tRowBuildScanAddNull(sinfo, schema->columns + i))) goto _exit;
} else if (COL_VAL_IS_NONE(&colValArray[colValIndex])) { } else if (COL_VAL_IS_NONE(&colValArray[colValIndex])) {