File Backported-fix-for-CORE-5549-Errors-building-ru... of Package firebird

Overview Repositories Revisions Requests Users Attributes Meta

File Backported-fix-for-CORE-5549-Errors-building-running.patch of Package firebird

From: AlexPeshkoff <peshkoff@mail.ru>
Date: Mon, 22 May 2017 18:02:39 +0300
Subject: Backported fix for CORE-5549: Errors building / running FB on non-SSE enabled HW
Patch-mainline: R3_0_3?
Git-commit: 5c4b4fc42a52e387b2fc2ea038f9143d70e515e7
References: CORE-5549

---
 src/common/classes/Hash.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/classes/Hash.cpp b/src/common/classes/Hash.cpp
index 661470888941..afe31c9a84a3 100644
--- a/src/common/classes/Hash.cpp
+++ b/src/common/classes/Hash.cpp
@@ -43,12 +43,11 @@ namespace
 	{
 		unsigned int hash_value = 0;
 
-		UCHAR* p;
+		UCHAR* const p = (UCHAR*) &hash_value;
 		const UCHAR* q = value;
 
 		while (length >= 4)
 		{
-			p = (UCHAR*) &hash_value;
 			p[0] += q[0];
 			p[1] += q[1];
 			p[2] += q[2];
@@ -57,18 +56,16 @@ namespace
 			q += 4;
 		}
 
-		p = (UCHAR*) &hash_value;
-
 		if (length >= 2)
 		{
 			p[0] += q[0];
 			p[1] += q[1];
 			length -= 2;
+			q += 2;
 		}
 
 		if (length)
 		{
-			q += 2;
 			*p += *q;
 		}
 
-- 
2.13.2

Places

File Backported-fix-for-CORE-5549-Errors-building-running.patch of Package firebird

Places