[Bf-blender-cvs] [3e84a2d] compositor-2016: Correct invalid pointer-pair compare check
Campbell Barton
noreply at git.blender.org
Wed Jun 8 21:50:15 CEST 2016
Commit: 3e84a2dec2bbaa168a98395cff18e73532a4b15d
Author: Campbell Barton
Date: Thu May 26 22:20:12 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rB3e84a2dec2bbaa168a98395cff18e73532a4b15d
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