From b88ac2aaa01f563327025c765118fd43d7ad039c Mon Sep 17 00:00:00 2001 From: "rjesup%wgate.com" Date: Thu, 13 Sep 2001 00:09:49 +0000 Subject: [PATCH] Bug 98711: Fix misuses of string.Right(). r=jfrancis, sr=jst git-svn-id: svn://10.0.0.236/trunk@102854 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsHTMLDataTransfer.cpp | 2 +- mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp | 2 +- mozilla/mailnews/news/src/nsNntpService.cpp | 2 +- mozilla/xpfe/appshell/src/nsUserInfoMac.cpp | 2 +- mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/editor/base/nsHTMLDataTransfer.cpp b/mozilla/editor/base/nsHTMLDataTransfer.cpp index a132011fd04..411f53a23df 100644 --- a/mozilla/editor/base/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/base/nsHTMLDataTransfer.cpp @@ -1558,7 +1558,7 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(nsIDOMNSRange *aNSRange, PRInt32 err, sep; sep = aInfoStr.FindChar((PRUnichar)','); aInfoStr.Left(numstr1, sep); - aInfoStr.Right(numstr2, sep+1); + aInfoStr.Right(numstr2, aInfoStr.Length() - (sep+1)); *outRangeStartHint = numstr1.ToInteger(&err) + contextDepth; *outRangeEndHint = numstr2.ToInteger(&err) + contextDepth; } diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp index a132011fd04..411f53a23df 100644 --- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -1558,7 +1558,7 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(nsIDOMNSRange *aNSRange, PRInt32 err, sep; sep = aInfoStr.FindChar((PRUnichar)','); aInfoStr.Left(numstr1, sep); - aInfoStr.Right(numstr2, sep+1); + aInfoStr.Right(numstr2, aInfoStr.Length() - (sep+1)); *outRangeStartHint = numstr1.ToInteger(&err) + contextDepth; *outRangeEndHint = numstr2.ToInteger(&err) + contextDepth; } diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index f04c9054794..85e50f490a4 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -676,7 +676,7 @@ nsNntpService::SetUpNntpUrlForPosting(nsINntpUrl *nntpUrl, const char *newsgroup if (slashpos > 0 ) { // theRest is "host/group" theRest.Left(currentHost, slashpos); - theRest.Right(currentGroup, slashpos); + theRest.Right(currentGroup, theRest.Length() - slashpos); } else { // str is "group" diff --git a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp index a9adba04b8d..8492b146375 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp @@ -94,7 +94,7 @@ nsUserInfo::GetDomain(char * *aDomain) if (atOffset != kNotFound) { nsCAutoString domainString; - tempString.Right(domainString, atOffset + 1); + tempString.Right(domainString, tempString.Length() - (atOffset + 1)); *aDomain = domainString.ToNewCString(); return NS_OK; } diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp index a9adba04b8d..8492b146375 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp @@ -94,7 +94,7 @@ nsUserInfo::GetDomain(char * *aDomain) if (atOffset != kNotFound) { nsCAutoString domainString; - tempString.Right(domainString, atOffset + 1); + tempString.Right(domainString, tempString.Length() - (atOffset + 1)); *aDomain = domainString.ToNewCString(); return NS_OK; }