[PATCH v2 0/1] MR7231: rpcrt4, winedbg, winevulkan: Various small fixes for Clang 20 + -Werror.
I don't think these are serious problems, but Clang 20's defaults (from llvm-mingw nightly) were resulting in build failures with `--enable-werror` due to `-Wtautological-compare` and `-Wunused-function`. I hope that the buffer wrap checking is somewhat idiomatic/standard.
If necessary, I can split off the winevulkan change, but it seems minor enough to be grouped in this MR.
-- v2: rpcrt4: Pointer arithmetic fixes (-Wtautological-compare).
From: William Horvath william@horvath.blog
--- dlls/rpcrt4/ndr_marshall.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c68eb0ee57e..f0249cba953 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -711,9 +711,8 @@ static inline ULONG safe_multiply(ULONG a, ULONG b)
static inline void safe_buffer_increment(MIDL_STUB_MESSAGE *pStubMsg, ULONG size) { - if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ - (pStubMsg->Buffer + size > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength)) - RpcRaiseException(RPC_X_BAD_STUB_DATA); + if (size > (SIZE_T)(((unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) - pStubMsg->Buffer)) + RpcRaiseException(RPC_X_BAD_STUB_DATA); /* integer overflow of pStubMsg->BufferSize */ pStubMsg->Buffer += size; }
@@ -732,8 +731,7 @@ static inline void safe_buffer_length_increment(MIDL_STUB_MESSAGE *pStubMsg, ULO * to do so */ static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, ULONG size) { - if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ - (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) + if (size > (SIZE_T)(pStubMsg->BufferEnd - pStubMsg->Buffer)) /* integer overflow of pStubMsg->Buffer */ { ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %lu\n", pStubMsg->Buffer, pStubMsg->BufferEnd, size); @@ -748,8 +746,7 @@ static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, U /* copies data to the buffer, checking that there is enough space to do so */ static inline void safe_copy_to_buffer(MIDL_STUB_MESSAGE *pStubMsg, const void *p, ULONG size) { - if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ - (pStubMsg->Buffer + size > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength)) + if (size > (SIZE_T)(((unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) - pStubMsg->Buffer)) /* integer overflow of pStubMsg->Buffer */ { ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %lu\n", pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength, @@ -767,8 +764,7 @@ static void validate_string_data(MIDL_STUB_MESSAGE *pStubMsg, ULONG bufsize, ULO ULONG i;
/* verify the buffer is safe to access */ - if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || - (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) + if (bufsize > (SIZE_T)(pStubMsg->BufferEnd - pStubMsg->Buffer)) { ERR("bufsize 0x%lx exceeded buffer end %p of buffer %p\n", bufsize, pStubMsg->BufferEnd, pStubMsg->Buffer);
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=151241
Your paranoid android.
=== debian11b (64 bit WoW report) ===
mf: mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8. mf.c:6525: Test failed: Test 2: WaitForSingleObject returned 258 mf.c:6525: Test failed: Test 2: Unexpected hr 0xd36d8.
Removed the winedbg commit (superseded by f5d7af3d1da55fef723e9f625bc26b80b6b4793a), also removed winevulkan commit as it's irrelevant to this warning.
This merge request was approved by Elizabeth Figura.
Jacek Caban (@jacek) commented about dlls/rpcrt4/ndr_marshall.c:
- to do so */
static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, ULONG size) {
- if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */
(pStubMsg->Buffer + size > pStubMsg->BufferEnd))
- if (size > (SIZE_T)(pStubMsg->BufferEnd - pStubMsg->Buffer)) /* integer overflow of pStubMsg->Buffer */
The Clang warning comes from the fact that unsigned (and, by extension, pointer) overflow is undefined behavior in C, and this subtraction is technically the same situation.
I suppose we could first check that `BufferEnd` is not smaller than `Buffer` and then perform the comparison as you did, but without the `SIZE_T` cast.
-
Elizabeth Figura (＠zfigura) -
Jacek Caban (＠jacek)
-
Marvin -
William Horvath
-
William Horvath (＠whrvth)