[PATCH v3 3/6] iphlpapi: Fix ipforward_row_cmp().

[Paul Gofman]

From: Paul Gofman

---
 dlls/iphlpapi/iphlpapi_main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 7b0384a7d1f..0de9b5172ab 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -2080,10 +2080,15 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s
 static int ipforward_row_cmp( const void *a, const void *b )
 {
     const MIB_IPFORWARDROW *rowA = a, *rowB = b;
-    return DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardDest ), RtlUlongByteSwap( rowB->dwForwardDest )) ||
-           DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) ||
-           DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) ||
-           DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardNextHop ), RtlUlongByteSwap( rowB->dwForwardNextHop ));
+    int ret;
+
+    if ((ret = DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardDest ), RtlUlongByteSwap( rowB->dwForwardDest ))))
+        return ret;
+    if ((ret = DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto)))
+        return ret;
+    if ((ret = DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy)))
+        return ret;
+    return DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardNextHop ), RtlUlongByteSwap( rowB->dwForwardNextHop ));
 }

/******************************************************************