Fix possible null pointer dereference

ildus · ildus · commit 8101397e1f91 · 2018-11-23T14:41:52.000+03:00
diff --git a/src/tsvector2_op.c b/src/tsvector2_op.c
@@ -1390,13 +1390,16 @@ checkclass_str(WordEntryPos *pv, int npos, QueryOperand *val,
 				posvec_iter++;
 			}
 		}
-		else					/* data != NULL */
+		else if (data)	/* data != NULL */
 		{
 			data->npos = npos;
 			data->pos = pv;
 			data->allocated = false;
 			result = true;
 		}
+		else
+			/* should not happen */
+			elog(ERROR, "invalid parameters");
 	}
 	else
 	{
@@ -2244,29 +2247,32 @@ ts_accum(MemoryContext persistentContext, TSVectorStat *stat, Datum data)
 	TSVector2	txt = DatumGetTSVector2(data);
 	uint32		i,
 				nbit = 0,
-				offset,
-				count = txt->size;
+				offset;
 
 	if (stat == NULL)
 	{							/* Init in first */
 		stat = MemoryContextAllocZero(persistentContext, sizeof(TSVectorStat));
 		stat->maxdepth = 1;
 	}
 
+	if (txt == NULL)
+		return stat;
+
 	/* simple check of correctness */
-	if (txt == NULL || count == 0)
+	if (txt->size == 0)
 	{
-		if (txt && txt != (TSVector2) DatumGetPointer(data))
+		if (txt != (TSVector2) DatumGetPointer(data))
 			pfree(txt);
+
 		return stat;
 	}
 
-	i = count - 1;
+	i = txt->size - 1;
 	for (; i > 0; i >>= 1)
 		nbit++;
 
 	nbit = 1 << nbit;
-	offset = (nbit - count) / 2;
+	offset = (nbit - txt->size) / 2;
 
 	insertStatEntry(persistentContext, stat, txt, (nbit >> 1) - offset);
 	chooseNextStatEntry(persistentContext, stat, txt, 0, nbit, offset);
