Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#135806 crashes [@ GetNextChar]

Browse Source 
modified GetNextChar implementation to handle the fact that aEnd points to
one character beyond the end.
r=harishd, sr=jst, a=asa, adt
This commit is contained in:
shanjian%netscape.com 2002-04-09 00:28:49 +00:00
parent 39526a32ac
commit f4935039c4
2 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htmlparser/src/nsParser.cpp
View File

@ -2096,19 +2096,11 @@ static PRBool DetectByteOrderMark(const unsigned char* aBytes, PRInt32 aLen, nsS
return oCharset.Length() > 0;
}
static const char kHTTPEquivStr[] = "http-equiv";
static const PRInt32 kHTTPEquivStrLen = sizeof(kHTTPEquivStr)-1;
static const char kContentTypeStr[] = "Content-Type";
static const PRInt32 kContentTypeStrLen = sizeof(kContentTypeStr)-1;
static const char kContentStr[] = "content";
static const PRInt32 kContentStrLen = sizeof(kContentStr)-1;
static const char kCharsetStr[] = "charset";
static const PRInt32 kCharsetStrLen = sizeof(kCharsetStr)-1;
inline const char GetNextChar(nsReadingIterator<char>& aStart,
nsReadingIterator<char>& aEnd)
inline const char GetNextChar(nsACString::const_iterator& aStart,
nsACString::const_iterator& aEnd)
{
return (aStart != aEnd) ? *(++aStart) : '\0';
NS_ASSERTION(aStart != aEnd, "end of buffer");
return (++aStart != aEnd) ? *aStart : '\0';
}
PRBool
@ -2130,13 +2122,14 @@ nsParser::DetectMetaTag(const char* aBytes,
// META tag in this block, looking upto 2k into it.
const nsASingleFragmentCString& str =
Substring(aBytes, aBytes + PR_MIN(aLen, 2048));
nsReadingIterator<char> begin, end;
// XXXldb Should be const_char_iterator when FindInReadable supports it.
nsACString::const_iterator begin, end;
str.BeginReading(begin);
str.EndReading(end);
nsReadingIterator<char> currPos(begin);
nsReadingIterator<char> tokEnd;
nsReadingIterator<char> tagEnd(begin);
nsACString::const_iterator currPos(begin);
nsACString::const_iterator tokEnd;
nsACString::const_iterator tagEnd(begin);
while (currPos != end) {
if (!FindCharInReadable('<', currPos, end))
@ -2153,14 +2146,13 @@ nsParser::DetectMetaTag(const char* aBytes,
GetNextChar(currPos, end) == '-') {
foundMatch = !foundMatch; // toggle until we've matching "--"
}
else if (foundMatch && *currPos == '>') {
foundMDC = PR_TRUE; // found comment end delimiter.
if (currPos != end)
++currPos;
}
else if (currPos == end) {
return PR_FALSE; // Couldn't find --[*s]> in this buffer
}
else if (foundMatch && *currPos == '>') {
foundMDC = PR_TRUE; // found comment end delimiter.
++currPos;
}
}
continue; // continue searching for META tag.
}

34
parser/htmlparser/src/nsParser.cpp
View File

@ -2096,19 +2096,11 @@ static PRBool DetectByteOrderMark(const unsigned char* aBytes, PRInt32 aLen, nsS
return oCharset.Length() > 0;
}
static const char kHTTPEquivStr[] = "http-equiv";
static const PRInt32 kHTTPEquivStrLen = sizeof(kHTTPEquivStr)-1;
static const char kContentTypeStr[] = "Content-Type";
static const PRInt32 kContentTypeStrLen = sizeof(kContentTypeStr)-1;
static const char kContentStr[] = "content";
static const PRInt32 kContentStrLen = sizeof(kContentStr)-1;
static const char kCharsetStr[] = "charset";
static const PRInt32 kCharsetStrLen = sizeof(kCharsetStr)-1;
inline const char GetNextChar(nsReadingIterator<char>& aStart,
nsReadingIterator<char>& aEnd)
inline const char GetNextChar(nsACString::const_iterator& aStart,
nsACString::const_iterator& aEnd)
{
return (aStart != aEnd) ? *(++aStart) : '\0';
NS_ASSERTION(aStart != aEnd, "end of buffer");
return (++aStart != aEnd) ? *aStart : '\0';
}
PRBool
@ -2130,13 +2122,14 @@ nsParser::DetectMetaTag(const char* aBytes,
// META tag in this block, looking upto 2k into it.
const nsASingleFragmentCString& str =
Substring(aBytes, aBytes + PR_MIN(aLen, 2048));
nsReadingIterator<char> begin, end;
// XXXldb Should be const_char_iterator when FindInReadable supports it.
nsACString::const_iterator begin, end;
str.BeginReading(begin);
str.EndReading(end);
nsReadingIterator<char> currPos(begin);
nsReadingIterator<char> tokEnd;
nsReadingIterator<char> tagEnd(begin);
nsACString::const_iterator currPos(begin);
nsACString::const_iterator tokEnd;
nsACString::const_iterator tagEnd(begin);
while (currPos != end) {
if (!FindCharInReadable('<', currPos, end))
@ -2153,14 +2146,13 @@ nsParser::DetectMetaTag(const char* aBytes,
GetNextChar(currPos, end) == '-') {
foundMatch = !foundMatch; // toggle until we've matching "--"
}
else if (foundMatch && *currPos == '>') {
foundMDC = PR_TRUE; // found comment end delimiter.
if (currPos != end)
++currPos;
}
else if (currPos == end) {
return PR_FALSE; // Couldn't find --[*s]> in this buffer
}
else if (foundMatch && *currPos == '>') {
foundMDC = PR_TRUE; // found comment end delimiter.
++currPos;
}
}
continue; // continue searching for META tag.
}