Fixes (un)signed comparison warning in regex.candroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2

The warning actually hinted at an unchecked return value.
As of this patch it is checked.

Bug: 28585892
Change-Id: Ibc09903129d3dce4d8a7b98d0313ec743fb937b5

1 files changed, 15 insertions, 11 deletions

diff --git a/src/regex.c b/src/regex.c
index 7a0d7e9..4223b02 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -327,10 +327,12 @@ void regex_format_error(struct regex_error_data const * error_data,
 	if (!buffer || !buf_size)
 		return;
 	rc = snprintf(buffer, buf_size, "REGEX back-end error: ");
-	if (rc < 0) {
-		buffer[0] = '\0';
-		return;
-	}
+	if (rc < 0)
+		/* If snprintf fails it constitutes a logical error that needs
+		 * fixing.
+		 */
+		abort();
+
 	pos += rc;
 	if (pos >= buf_size)
 		goto truncated;
@@ -343,10 +345,9 @@ void regex_format_error(struct regex_error_data const * error_data,
 		rc = snprintf(buffer + pos, buf_size - pos, "At offset %d: ",
 				error_data->error_offset);
 #endif
-		if (rc < 0) {
-			buffer[0] = '\0';
-			return;
-		}
+		if (rc < 0)
+			abort();
+
 	}
 	pos += rc;
 	if (pos >= buf_size)
@@ -361,13 +362,16 @@ void regex_format_error(struct regex_error_data const * error_data,
 #else
 	rc = snprintf(buffer + pos, buf_size - pos, "%s",
 			error_data->error_buffer);
-	if (rc < strlen(error_data->error_buffer))
+	if (rc < 0)
+		abort();
+
+	if ((size_t)rc < strlen(error_data->error_buffer))
 		goto truncated;
 #endif
 
 	return;
 
-	truncated:
+truncated:
 	/* replace end of string with "..." to indicate that it was truncated */
 	switch (the_end_length) {
 		/* no break statements, fall-through is intended */
@@ -382,5 +386,5 @@ void regex_format_error(struct regex_error_data const * error_data,
 		default:
 			break;
 	}
-
+	return;
 }