[Bf-blender-cvs] [d5e0e68] master: Correct invalid pointer-pair compare check

Campbell Barton noreply at git.blender.org
Thu May 26 14:12:05 CEST 2016


Commit: d5e0e681cea846facb4f2777921f6612be3ee193
Author: Campbell Barton
Date:   Thu May 26 22:20:12 2016 +1000
Branches: master
https://developer.blender.org/rBd5e0e681cea846facb4f2777921f6612be3ee193

Correct invalid pointer-pair compare check

===================================================================

M	source/blender/blenlib/intern/BLI_ghash.c

===================================================================

diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 06946e5..05f2d92 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -1287,7 +1287,7 @@ bool BLI_ghashutil_paircmp(const void *a, const void *b)
 	const GHashPair *A = a;
 	const GHashPair *B = b;
 
-	return (BLI_ghashutil_ptrcmp(A->first, B->first) ||
+	return (BLI_ghashutil_ptrcmp(A->first, B->first) &&
 	        BLI_ghashutil_ptrcmp(A->second, B->second));
 }




More information about the Bf-blender-cvs mailing list