Merge pull request #7040 from livecodeian/bugfix-canvas_point_equal

livecodepanos · web-flow · commit b31d14eb0813 · 2019-05-15T17:00:38.000+03:00
[[ Bug 22060 ]] Stop point values with matching hashes from overwriting each other.
diff --git a/docs/lcb/notes/22060.md b/docs/lcb/notes/22060.md
@@ -0,0 +1 @@
+# [22060] Fix bug in canvas library that can result in Points being initialized with previously used values.
diff --git a/engine/src/module-canvas.cpp b/engine/src/module-canvas.cpp
@@ -843,7 +843,7 @@ static bool __MCCanvasPointEqual(MCValueRef p_left, MCValueRef p_right)
 	if (p_left == p_right)
 		return true;
 	
-	return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_left), sizeof(__MCCanvasPointImpl)) == 0;
+	return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_right), sizeof(__MCCanvasPointImpl)) == 0;
 }
 
 static hash_t __MCCanvasPointHash(MCValueRef p_value)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [22060] Fix bug in canvas library that can result in Points being initialized with previously used values.`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ static bool __MCCanvasPointEqual(MCValueRef p_left, MCValueRef p_right)`
`843`	`843`	`if (p_left == p_right)`
`844`	`844`	`return true;`
`845`	`845`
`846`		`- return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_left), sizeof(__MCCanvasPointImpl)) == 0;`
	`846`	`+ return MCMemoryCompare(MCValueGetExtraBytesPtr(p_left), MCValueGetExtraBytesPtr(p_right), sizeof(__MCCanvasPointImpl)) == 0;`
`847`	`847`	`}`
`848`	`848`
`849`	`849`	`static hash_t __MCCanvasPointHash(MCValueRef p_value)`