From 31d9c7fbca47c3f8f0f9eaa0cc94e7be955b1053 Mon Sep 17 00:00:00 2001 From: "akkana%netscape.com" Date: Fri, 1 Sep 2000 22:27:26 +0000 Subject: [PATCH] 50311, 51088: fix a hang/crash in Rewrap. r=scc --- editor/base/nsInternetCiter.cpp | 2 +- editor/libeditor/text/nsInternetCiter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/base/nsInternetCiter.cpp b/editor/base/nsInternetCiter.cpp index c983eea13561..5b5ae306af63 100644 --- a/editor/base/nsInternetCiter.cpp +++ b/editor/base/nsInternetCiter.cpp @@ -142,7 +142,7 @@ nsInternetCiter::StripCitesAndLinebreaks(const nsString& aInString, else aOutString.AppendWithConversion('\n'); // DOM linebreaks, not NS_LINEBREAK // Skip over any more consecutive linebreak-like characters: - while (aOutString[i] == '\r' || aOutString[i] == '\n') + while (i < length && (aInString[i] == '\r' || aInString[i] == '\n')) ++i; } else // no more newlines diff --git a/editor/libeditor/text/nsInternetCiter.cpp b/editor/libeditor/text/nsInternetCiter.cpp index c983eea13561..5b5ae306af63 100644 --- a/editor/libeditor/text/nsInternetCiter.cpp +++ b/editor/libeditor/text/nsInternetCiter.cpp @@ -142,7 +142,7 @@ nsInternetCiter::StripCitesAndLinebreaks(const nsString& aInString, else aOutString.AppendWithConversion('\n'); // DOM linebreaks, not NS_LINEBREAK // Skip over any more consecutive linebreak-like characters: - while (aOutString[i] == '\r' || aOutString[i] == '\n') + while (i < length && (aInString[i] == '\r' || aInString[i] == '\n')) ++i; } else // no more newlines