зеркало из https://github.com/mozilla/pjs.git
fix for bug #197972.
fix assertions when trying to generate collation keys for cards without display names in addition, we'd bail out before creating the secondary sort key. r=cavin, sr=bienvenu.
This commit is contained in:
Родитель
17ec56b4a9
Коммит
ca1aa169f1
|
@ -788,6 +788,14 @@ nsresult nsAbView::CreateCollationKey(const PRUnichar *aSource, PRUint8 **aKey,
|
||||||
NS_ENSURE_ARG_POINTER(aKey);
|
NS_ENSURE_ARG_POINTER(aKey);
|
||||||
NS_ENSURE_ARG_POINTER(aKeyLen);
|
NS_ENSURE_ARG_POINTER(aKeyLen);
|
||||||
|
|
||||||
|
if (!*aSource)
|
||||||
|
{
|
||||||
|
// no string, so no key.
|
||||||
|
*aKey = nsnull;
|
||||||
|
*aKeyLen = 0;
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
if (!mCollationKeyGenerator)
|
if (!mCollationKeyGenerator)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче