From ca1aa169f16268da7a7d334f51558d1b9868e81c Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Tue, 18 Mar 2003 18:33:33 +0000
Subject: [PATCH] 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.

---
 mailnews/addrbook/src/nsAbView.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mailnews/addrbook/src/nsAbView.cpp b/mailnews/addrbook/src/nsAbView.cpp
index ed5a0cbfcb0..bab085b3615 100644
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -788,6 +788,14 @@ nsresult nsAbView::CreateCollationKey(const PRUnichar *aSource, PRUint8 **aKey,
   NS_ENSURE_ARG_POINTER(aKey);
   NS_ENSURE_ARG_POINTER(aKeyLen);
 
+  if (!*aSource)
+  {
+    // no string, so no key.
+    *aKey = nsnull;
+    *aKeyLen = 0;
+    return NS_OK;
+  }
+
   nsresult rv;
   if (!mCollationKeyGenerator)
   {