From fed13d8a86b7587758f67e892384cc8eece216cd Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Wed, 24 May 2006 16:48:17 +0000 Subject: [PATCH] fix freeze dropping v-card with base64 data we can't parse, sr=mscott 334947 git-svn-id: svn://10.0.0.236/trunk@198329 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/addrbook/src/nsVCard.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/addrbook/src/nsVCard.cpp b/mozilla/mailnews/addrbook/src/nsVCard.cpp index 94b7183fb21..bfc1d4994a4 100644 --- a/mozilla/mailnews/addrbook/src/nsVCard.cpp +++ b/mozilla/mailnews/addrbook/src/nsVCard.cpp @@ -1127,9 +1127,9 @@ static int yylex() { if (lexWithinMode(L_BASE64)) { /* get each char and convert to bin on the fly... */ p = lexGetDataFromBase64(); - yylval.str = p; - return STRING; - } + yylval.str = p; + return !p && lexLookahead() == EOF ? 0 : STRING; + } else if (lexWithinMode(L_QUOTED_PRINTABLE)) { p = lexGetQuotedPrintable(); }