Merge pull request #352 from Tarsnap/libcperciva-import

libcperciva import
Tarsnap · Apr 26, 2022 · 725a54c · 725a54c
2 parents 92aab18 + b7ad85c
commit 725a54c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/libcperciva/alg/sha256.c b/libcperciva/alg/sha256.c
@@ -248,7 +248,7 @@ SHA256_Transform(uint32_t state[static restrict 8],
 	assert(hwaccel != HW_UNSET);
 #endif
 
-	switch(hwaccel) {
+	switch (hwaccel) {
 #if defined(CPUSUPPORT_X86_SHANI) && defined(CPUSUPPORT_X86_SSSE3)
 	case HW_X86_SHANI:
 		SHA256_Transform_shani(state, block);

diff --git a/libcperciva/util/imalloc.h b/libcperciva/util/imalloc.h
@@ -1,18 +1,26 @@
 #ifndef _IMALLOC_H_
 #define _IMALLOC_H_
 
+#include <assert.h>
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 /**
  * imalloc(nrec, reclen):
  * Allocate ${nrec} records of length ${reclen}.  Check for size_t overflow.
+ * ${reclen} must not be zero.  If ${nrec} is zero, return NULL.
  */
 static inline void *
 imalloc(size_t nrec, size_t reclen)
 {
 
+	/* Sanity check. */
+	assert(reclen != 0);
+
+	if (nrec == 0)
+		return (NULL);
+
 	if (nrec > SIZE_MAX / reclen) {
 		errno = ENOMEM;
 		return (NULL);

diff --git a/libcperciva/util/sock.c b/libcperciva/util/sock.c
@@ -90,6 +90,9 @@ sock_resolve_host(const char * addr, const char * ports)
 	for (n = 0, r = res; r != NULL; r = r->ai_next)
 		n++;
 
+	/* Sanity check. */
+	assert(n < SIZE_MAX);
+
 	/* Allocate our response array. */
 	if (IMALLOC(sas, n + 1, struct sock_addr *))
 		goto err1;

diff --git a/perftests/standalone-enc/main.c b/perftests/standalone-enc/main.c
@@ -81,7 +81,7 @@ main(int argc, char * argv[])
 	print_hardware("Testing spiped speed limits");
 
 	/* Run the desired test. */
-	switch(desired_test) {
+	switch (desired_test) {
 	case 1:
 		if (hmac_perftest(perfsizes, num_perf,
 		    nbytes_perftest, nbytes_warmup))

diff --git a/tests/pthread_create_blocking_np/timing.c b/tests/pthread_create_blocking_np/timing.c
@@ -30,7 +30,7 @@ static struct testcase {
 			warn0(#prev " is after " #next);		\
 			goto err0;					\
 		}							\
-	} while(0)
+	} while (0)
 
 /* Each test. */
 struct info {

diff --git a/tests/pushbits/main.c b/tests/pushbits/main.c
@@ -462,7 +462,7 @@ main(int argc, char ** argv)
 	}
 
 	/* Run the desired test. */
-	switch(desired_test) {
+	switch (desired_test) {
 	case 1:
 		if ((filename_in == NULL) || (filename_out == NULL))
 			usage();