From: bluhm <bluhm@openbsd.org>
Date: Mon, 26 Aug 2024 11:52:54 +0000 (+0000)
Subject: Evaluate arguments of bitstring macros only once.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4491bd906279ac5ed280f88e0b77158b6284ff46;p=openbsd

Evaluate arguments of bitstring macros only once.

According to bit_alloc(3) man page the arguments to bitstring macros
are evaluated only once and may safely have side effects.  Fix the
implementation with temporary variables to fulfill this requirement.

OK florian@ deraadt@
---

diff --git a/include/bitstring.h b/include/bitstring.h
index 13528746800..406a973581e 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bitstring.h,v 1.6 2020/05/10 00:56:06 guenther Exp $	*/
+/*	$OpenBSD: bitstring.h,v 1.7 2024/08/26 11:52:54 bluhm Exp $	*/
 /*	$NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $	*/
 
 /*
@@ -70,16 +70,22 @@ typedef	unsigned char bitstr_t;
 	((name)[bitstr_size(nbits)])
 
 				/* is bit N of bitstring name set? */
-#define	bit_test(name, bit) \
-	((name)[_bit_byte(bit)] & _bit_mask(bit))
+#define	bit_test(name, bit) ({ \
+	register int __tbit = (bit); \
+	((name)[_bit_byte(__tbit)] & _bit_mask(__tbit)); \
+})
 
 				/* set bit N of bitstring name */
-#define	bit_set(name, bit) \
-	((name)[_bit_byte(bit)] |= _bit_mask(bit))
+#define	bit_set(name, bit) do { \
+	register int __sbit = (bit); \
+	((name)[_bit_byte(__sbit)] |= _bit_mask(__sbit)); \
+} while(0)
 
 				/* clear bit N of bitstring name */
-#define	bit_clear(name, bit) \
-	((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
+#define	bit_clear(name, bit) do { \
+	register int __cbit = (bit); \
+	((name)[_bit_byte(__cbit)] &= ~_bit_mask(__cbit)); \
+} while(0)
 
 				/* clear bits start ... stop in bitstring */
 #define	bit_nclear(name, start, stop) do { \