patch 8.2.4402: missing parenthesis may cause unexpected problems
Problem: Missing parenthesis may cause unexpected problems.
Solution: Add more parenthesis is macros. (closes #9788)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 88b8f89..7c313f5 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7878,21 +7878,21 @@
*x = vim_time();
}
-#define ROTL(x, k) ((x << k) | (x >> (32 - k)))
+#define ROTL(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
#define SPLITMIX32(x, z) ( \
- z = (x += 0x9e3779b9), \
- z = (z ^ (z >> 16)) * 0x85ebca6b, \
- z = (z ^ (z >> 13)) * 0xc2b2ae35, \
- z ^ (z >> 16) \
+ (z) = ((x) += 0x9e3779b9), \
+ (z) = ((z) ^ ((z) >> 16)) * 0x85ebca6b, \
+ (z) = ((z) ^ ((z) >> 13)) * 0xc2b2ae35, \
+ (z) ^ ((z) >> 16) \
)
#define SHUFFLE_XOSHIRO128STARSTAR(x, y, z, w) \
- result = ROTL(y * 5, 7) * 9; \
- t = y << 9; \
- z ^= x; \
- w ^= y; \
- y ^= z, x ^= w; \
- z ^= t; \
- w = ROTL(w, 11);
+ result = ROTL((y) * 5, 7) * 9; \
+ t = (y) << 9; \
+ (z) ^= (x); \
+ (w) ^= (y); \
+ (y) ^= (z), (x) ^= (w); \
+ (z) ^= t; \
+ (w) = ROTL(w, 11);
/*
* "rand()" function