elasticarray: remove redundant checks

Tarsnap · Oct 15, 2023 · 756f05c · 756f05c
1 parent 4773012
commit 756f05c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/libcperciva/datastruct/elasticarray.c b/libcperciva/datastruct/elasticarray.c
@@ -161,8 +161,7 @@ elasticarray_append(struct elasticarray * EA,
 	size_t nsize;
 
 	/* Check for overflow. */
-	if ((nrec > SIZE_MAX / reclen) ||
-	    (nrec * reclen > SIZE_MAX - EA->size)) {
+	if (nrec > ((SIZE_MAX - EA->size) / reclen)) {
 		errno = ENOMEM;
 		goto err0;
 	}
@@ -205,8 +204,7 @@ elasticarray_shrink(struct elasticarray * EA, size_t nrec, size_t reclen)
 	size_t nsize;
 
 	/* Figure out how much to keep. */
-	if ((nrec > SIZE_MAX / reclen) ||
-	    (nrec * reclen > EA->size))
+	if (nrec > EA->size / reclen)
 		nsize = 0;
 	else
 		nsize = EA->size - nrec * reclen;