Fix clang warnings

ildus · ildus · commit 827e51081d53 · 2018-11-23T15:35:14.000+03:00
diff --git a/src/tsvector2_op.c b/src/tsvector2_op.c
@@ -1538,8 +1538,11 @@ checkcondition_str(void *checkval, QueryOperand *val, ExecPhraseData *data)
 						}
 					}
 
-					memcpy(allpos + npos, data->pos, sizeof(WordEntryPos) * data->npos);
-					npos += data->npos;
+					if (allpos)
+					{
+						memcpy(allpos + npos, data->pos, sizeof(WordEntryPos) * data->npos);
+						npos += data->npos;
+					}
 				}
 			}
 			else
@@ -1905,7 +1908,8 @@ TS_phrase_execute(QueryItem *curitem, void *arg, uint32 flags,
 			maxwidth = Max(Ldata.width, Rdata.width);
 			Loffset = maxwidth - Ldata.width;
 			Roffset = maxwidth - Rdata.width;
-			data->width = maxwidth;
+			if (data)
+				data->width = maxwidth;
 
 			if (Ldata.negate && Rdata.negate)
 			{
@@ -1924,7 +1928,8 @@ TS_phrase_execute(QueryItem *curitem, void *arg, uint32 flags,
 										TSPO_L_ONLY,
 										Loffset, Roffset,
 										Ldata.npos);
-				data->negate = true;
+				if (data)
+					data->negate = true;
 				return true;
 			}
 			else if (Rdata.negate)
@@ -1934,7 +1939,8 @@ TS_phrase_execute(QueryItem *curitem, void *arg, uint32 flags,
 										TSPO_R_ONLY,
 										Loffset, Roffset,
 										Rdata.npos);
-				data->negate = true;
+				if (data)
+					data->negate = true;
 				return true;
 			}
 			else

Original file line number	Diff line number	Diff line change
`@@ -1538,8 +1538,11 @@ checkcondition_str(void checkval, QueryOperand val, ExecPhraseData *data)`
`1538`	`1538`	`}`
`1539`	`1539`	`}`
`1540`	`1540`
`1541`		`- memcpy(allpos + npos, data->pos, sizeof(WordEntryPos) * data->npos);`
`1542`		`- npos += data->npos;`
	`1541`	`+ if (allpos)`
	`1542`	`+ {`
	`1543`	`+ memcpy(allpos + npos, data->pos, sizeof(WordEntryPos) * data->npos);`
	`1544`	`+ npos += data->npos;`
	`1545`	`+ }`
`1543`	`1546`	`}`
`1544`	`1547`	`}`
`1545`	`1548`	`else`
`@@ -1905,7 +1908,8 @@ TS_phrase_execute(QueryItem curitem, void arg, uint32 flags,`
`1905`	`1908`	`maxwidth = Max(Ldata.width, Rdata.width);`
`1906`	`1909`	`Loffset = maxwidth - Ldata.width;`
`1907`	`1910`	`Roffset = maxwidth - Rdata.width;`
`1908`		`- data->width = maxwidth;`
	`1911`	`+ if (data)`
	`1912`	`+ data->width = maxwidth;`
`1909`	`1913`
`1910`	`1914`	`if (Ldata.negate && Rdata.negate)`
`1911`	`1915`	`{`
`@@ -1924,7 +1928,8 @@ TS_phrase_execute(QueryItem curitem, void arg, uint32 flags,`
`1924`	`1928`	`TSPO_L_ONLY,`
`1925`	`1929`	`Loffset, Roffset,`
`1926`	`1930`	`Ldata.npos);`
`1927`		`- data->negate = true;`
	`1931`	`+ if (data)`
	`1932`	`+ data->negate = true;`
`1928`	`1933`	`return true;`
`1929`	`1934`	`}`
`1930`	`1935`	`else if (Rdata.negate)`
`@@ -1934,7 +1939,8 @@ TS_phrase_execute(QueryItem curitem, void arg, uint32 flags,`
`1934`	`1939`	`TSPO_R_ONLY,`
`1935`	`1940`	`Loffset, Roffset,`
`1936`	`1941`	`Rdata.npos);`
`1937`		`- data->negate = true;`
	`1942`	`+ if (data)`
	`1943`	`+ data->negate = true;`
`1938`	`1944`	`return true;`
`1939`	`1945`	`}`
`1940`	`1946`	`else`