Fixes per clang analyzer complains

za-arthur · za-arthur · commit e9c53b5d2e8d · 2019-04-16T16:40:56.000+03:00
diff --git a/src/rum_arr_utils.c b/src/rum_arr_utils.c
@@ -733,6 +733,7 @@ cmpAscArrayElem(const void *a, const void *b, void *arg)
 {
 	FmgrInfo	*cmpFunc = (FmgrInfo*)arg;
 
+	Assert(a && b);
 	return DatumGetInt32(FunctionCall2Coll(cmpFunc, DEFAULT_COLLATION_OID, *(Datum*)a, *(Datum*)b));
 }
 
diff --git a/src/rum_ts_utils.c b/src/rum_ts_utils.c
@@ -1242,7 +1242,7 @@ calc_score_docr(float4 *arrdata, DocRepresentation *doc, uint32 doclen,
 		int			new_cover_key = 0;
 		int			nitems = 0;
 
-		while (ptr <= ext.end)
+		while (ptr && ptr <= ext.end)
 		{
 			InvSum += arrdata[ptr->wclass];
 			/* SK: Quick and dirty hash key. Hope collisions will be not too frequent. */
diff --git a/src/rumget.c b/src/rumget.c
@@ -1112,7 +1112,7 @@ entryGetNextItemList(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
 		entry->isFinished = setListPositionScanEntry(rumstate, entry);
 	}
 
-	Assert(entry->nlist > 0);
+	Assert(entry->nlist > 0 && entry->list);
 
 	entry->curItem = entry->list[entry->offset];
 	entry->offset += entry->scanDirection;
@@ -1169,7 +1169,7 @@ entryGetItem(RumState * rumstate, RumScanEntry entry, bool *nextEntryList, Snaps
 			if (!ItemPointerIsMin(&entry->collectRumItem.item.iptr))
 				collected = entry->collectRumItem;
 			else
-				ItemPointerSetMin(&collected.item.iptr);
+				MemSet(&collected, 0, sizeof(collected));
 
 			ItemPointerSetMin(&entry->curItem.iptr);
 
diff --git a/src/rumsort.c b/src/rumsort.c
@@ -2426,7 +2426,6 @@ mergeruns(RumTuplesortstate *state)
 	else
 	{
 		numInputTapes = state->tapeRange;
-		numTapes = state->maxTapes;
 	}
 
 	state->read_buffer_size = Max(state->availMem / numInputTapes, 0);
diff --git a/src/rumvacuum.c b/src/rumvacuum.c
@@ -53,6 +53,7 @@ rumVacuumPostingList(RumVacuumState * gvs, OffsetNumber attnum, Pointer src,
 				prev,
 				ptr = src;
 
+	*newSize = 0;
 	ItemPointerSetMin(&item.iptr);
 
 	/*
diff --git a/travis/mk_dockerfile.sh b/travis/mk_dockerfile.sh
@@ -4,7 +4,7 @@ if [ -z ${PG_VERSION+x} ]; then
 fi
 
 if [ -z ${LEVEL+x} ]; then
-	LEVEL=scan-build
+	LEVEL=standard
 fi
 
 echo PG_VERSION=${PG_VERSION}
diff --git a/travis/run_tests.sh b/travis/run_tests.sh
@@ -5,7 +5,6 @@
 #
 # supported levels:
 #		* standard
-#		* scan-build
 #		* hardcore
 #
 
@@ -60,8 +59,7 @@ fi
 pg_config
 
 # perform code checks if asked to
-if [ "$LEVEL" = "scan-build" ] || \
-   [ "$LEVEL" = "hardcore" ]; then
+if [ "$LEVEL" = "hardcore" ]; then
 
 	# perform static analyzis
 	scan-build --status-bugs make USE_PGXS=1 || status=$?

Original file line number	Diff line number	Diff line change
`@@ -733,6 +733,7 @@ cmpAscArrayElem(const void a, const void b, void *arg)`
`733`	`733`	`{`
`734`	`734`	`FmgrInfo cmpFunc = (FmgrInfo)arg;`
`735`	`735`
	`736`	`+ Assert(a && b);`
`736`	`737`	`return DatumGetInt32(FunctionCall2Coll(cmpFunc, DEFAULT_COLLATION_OID, (Datum)a, (Datum)b));`
`737`	`738`	`}`
`738`	`739`
Original file line number	Diff line number	Diff line change
`@@ -1242,7 +1242,7 @@ calc_score_docr(float4 arrdata, DocRepresentation doc, uint32 doclen,`
`1242`	`1242`	`int new_cover_key = 0;`
`1243`	`1243`	`int nitems = 0;`
`1244`	`1244`
`1245`		`- while (ptr <= ext.end)`
	`1245`	`+ while (ptr && ptr <= ext.end)`
`1246`	`1246`	`{`
`1247`	`1247`	`InvSum += arrdata[ptr->wclass];`
`1248`	`1248`	`/* SK: Quick and dirty hash key. Hope collisions will be not too frequent. */`
Original file line number	Diff line number	Diff line change
`@@ -2426,7 +2426,6 @@ mergeruns(RumTuplesortstate *state)`
`2426`	`2426`	`else`
`2427`	`2427`	`{`
`2428`	`2428`	`numInputTapes = state->tapeRange;`
`2429`		`- numTapes = state->maxTapes;`
`2430`	`2429`	`}`
`2431`	`2430`
`2432`	`2431`	`state->read_buffer_size = Max(state->availMem / numInputTapes, 0);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`#`
`6`	`6`	`# supported levels:`
`7`	`7`	`# * standard`
`8`		`-# * scan-build`
`9`	`8`	`# * hardcore`
`10`	`9`	`#`
`11`	`10`
`@@ -60,8 +59,7 @@ fi`
`60`	`59`	`pg_config`
`61`	`60`
`62`	`61`	`# perform code checks if asked to`
`63`		`-if [ "$LEVEL" = "scan-build" ] \|\| \`
`64`		`- [ "$LEVEL" = "hardcore" ]; then`
	`62`	`+if [ "$LEVEL" = "hardcore" ]; then`
`65`	`63`
`66`	`64`	`# perform static analyzis`
`67`	`65`	`scan-build --status-bugs make USE_PGXS=1 \|\| status=$?`