Merge pull request #418 from kevcadieux/shell-sort-fix

Fixing heap-buffer-overflow error uncovered by ASan in the [Sort] test.
electronicarts · Jul 16, 2021 · b369a75 · b369a75
2 parents fad5471 + a3f459b
commit b369a75
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/EASTL/sort.h b/include/EASTL/sort.h
@@ -305,7 +305,7 @@ namespace eastl
 					{
 						iBack = iCurrent = iSorted;
 
-						for(iBack -= nSpace; (iCurrent != iInsertFirst) && compare(*iCurrent, *iBack); iCurrent = iBack, iBack -= nSpace)
+						for(; (iCurrent != iInsertFirst) && compare(*iCurrent, *(iBack -= nSpace)); iCurrent = iBack)
 						{
 							EASTL_VALIDATE_COMPARE(!compare(*iBack, *iCurrent)); // Validate that the compare function is sane.
 							eastl::iter_swap(iCurrent, iBack);