system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:55:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: qsort: comparator must not get the same pointer.

Browse source
This commit is contained in:
Marcus Meissner 2010-05-23 13:33:40 +02:00 committed by Alexandre Julliard
parent 6f358ef867
commit 34d17c9ea1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ntdll/misc.c
View file

@ -272,7 +272,7 @@ NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const
for (k=left; k<=right; k++) {
/*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/
if (compar(X(barr,i),X(barr,j))<0) {
if (i != j && compar(X(barr,i),X(barr,j))<0) {
memcpy(X(arr,k),X(barr,i),elemsize);
i++;
} else {

3
dlls/ntdll/tests/string.c
View file

@ -1145,16 +1145,19 @@ static void test_wcsrchr(void)
static __cdecl int intcomparefunc(const void *a, const void*b)
{
ok (a != b, "must never get the same pointer\n");
return (*(int*)a) - (*(int*)b);
}
static __cdecl int charcomparefunc(const void *a, const void*b)
{
ok (a != b, "must never get the same pointer\n");
return (*(char*)a) - (*(char*)b);
}
static __cdecl int strcomparefunc(const void *a, const void*b)
{
ok (a != b, "must never get the same pointer\n");
return lstrcmpA(*(char**)a,*(char**)b);
}