libsemanage: silence underflow

Signed-off-by: Christian Göttsche <[email protected]>

Author: cgzones

libsemanage/src/utilities.c

@@ -254,7 +254,11 @@ char *semanage_str_replace(const char *search, const char *replace,
 		return strdup(src);
 
 	/* Allocate the result string */
-	newsize = strlen(src) + 1 + count * (rlen - slen);
+	newsize = strlen(src) + 1;
+	if (rlen >= slen)
+		newsize += count * (rlen - slen);
+	else
+		newsize -= count * (slen - rlen);
 	result = malloc(newsize);
 	if (!result)
 		return NULL;

libsemanage/tests/test_other.c

@@ -116,7 +116,7 @@ void test_debug(void)
 	CU_ASSERT(semanage_module_info_create(sh, &modinfo) >= 0);
 
 	/* test */
-	CU_ASSERT(semanage_module_info_set_priority(sh, modinfo, -42) < 0);
+	CU_ASSERT(semanage_module_info_set_priority(sh, modinfo, (uint16_t)-42) < 0);
 
 	/* cleanup */
 	semanage_module_info_destroy(sh, modinfo);