From 15d87d245211615e1d6081ac78e0d476b6af3821 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 27 Jul 1999 16:26:30 +0000 Subject: [PATCH] check for nKeyLength not arKey --- ChangeLog | 2 +- ext/standard/basic_functions.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14f4089854e..a6fc1a7c92b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ PHP 4.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 -- Fixed a bug that prevented uksort() from working correctly (Andrey) +- Fixed bugs in uksort() and ksort() sort ordering (Andrey) - Fixed a memory leak when using assignment-op operators with lvalue of type string. - Fixed a problem in inheritence from classes that are defined in include()d diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 253eff12fe9..e80cfecced1 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -634,11 +634,11 @@ static int array_key_compare(const void *a, const void *b) first = *((Bucket **) a); second = *((Bucket **) b); - if (first->arKey == NULL && second->arKey == NULL) { + if (first->nKeyLength == 0 && second->nKeyLength == 0) { return (first->h - second->h); - } else if (first->arKey == NULL) { + } else if (first->nKeyLength == 0) { return -1; - } else if (second->arKey == NULL) { + } else if (second->nKeyLength == 0) { return 1; } min = MIN(first->nKeyLength, second->nKeyLength);