Add missing empty array check

The following commands might enter long loop: * pgroonga_snippet_html * pgroonga_highlight_html * pgroonga_command
pgroonga · Oct 7, 2017 · af2d78b · af2d78b
1 parent 98df502
commit af2d78b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/pgrn-keywords.c b/src/pgrn-keywords.c
@@ -30,7 +30,10 @@ PGrnKeywordsUpdateTable(ArrayType *keywords, grn_obj *keywordsTable)
 
 		GRN_BULK_REWIND(&keywordIDs);
 
-		n = ARR_DIMS(keywords)[0];
+		if (ARR_NDIM(keywords) == 0)
+			n = 0;
+		else
+			n = ARR_DIMS(keywords)[0];
 		for (i = 1; i <= n; i++)
 		{
 			Datum keywordDatum;

diff --git a/src/pgrn-query-expand.c b/src/pgrn-query-expand.c
@@ -120,6 +120,9 @@ func_query_expander_postgresql(grn_ctx *ctx,
 			int i, n;
 
 			synonymsArray = DatumGetArrayTypeP(synonymsDatum);
+			if (ARR_NDIM(synonymsArray) == 0)
+				continue;
+
 			n = ARR_DIMS(synonymsArray)[0];
 			if (n == 0)
 				continue;

diff --git a/src/pgrn-snippet-html.c b/src/pgrn-snippet-html.c
@@ -42,7 +42,10 @@ PGrnSnipCreate(ArrayType *keywords)
 	{
 		int i, n;
 
-		n = ARR_DIMS(keywords)[0];
+		if (ARR_NDIM(keywords) == 0)
+			n = 0;
+		else
+			n = ARR_DIMS(keywords)[0];
 		for (i = 1; i <= n; i++)
 		{
 			Datum keywordDatum;

diff --git a/src/pgroonga.c b/src/pgroonga.c
@@ -1370,10 +1370,10 @@ pgroonga_command(PG_FUNCTION_ARGS)
 		ArrayType *arguments = PG_GETARG_ARRAYTYPE_P(1);
 		int i, n;
 
-		n = ARR_DIMS(arguments)[0];
-		if ((n % 2) != 0)
-		{
-		}
+		if (ARR_NDIM(arguments) == 0)
+			n = 0;
+		else
+			n = ARR_DIMS(arguments)[0];
 
 		grn_obj_reinit(ctx, command, GRN_DB_TEXT, 0);
 		GRN_TEXT_PUT(ctx,