Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possible access to unitialized memory. Bug 221189, r=biesi, sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@147569 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2003-10-04 20:27:32 +00:00
parent a484eaa9b2
commit ec866c4e4e
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
View File

@ -386,42 +386,33 @@ PRBool nsUnknownDecoder::SniffForHTML(nsIRequest* aRequest)
return PR_FALSE;
}
// Now look for HTML. First, we get us a nice nsCAutoString
// containing our data in a readonly-ish manner...
const CBufDescriptor bufDesc((const char*)mBuffer, PR_TRUE, mBufferLen, mBufferLen);
const nsCAutoString str(bufDesc);
nsCAutoString::const_iterator start, end;
str.BeginReading(start);
str.EndReading(end);
PRUint32 pos = 0; // for Substring ease
// Now look for HTML.
const char* str = mBuffer;
const char* end = mBuffer + mBufferLen;
// skip leading whitespace
while (start != end && nsCRT::IsAsciiSpace(*start)) {
++start;
++pos;
while (str != end && nsCRT::IsAsciiSpace(*str)) {
++str;
}
// did we find something like a start tag?
if (start == end || *start != '<' || ++start == end) {
if (str == end || *str != '<' || ++str == end) {
return PR_FALSE;
}
// advance pos to keep synch with |start|
++pos;
// If we seem to be SGML or XML and we got down here, just pretend we're HTML
if (*start == '!' || *start == '?') {
if (*str == '!' || *str == '?') {
mContentType = TEXT_HTML;
return PR_TRUE;
}
const char* strPtr = str.get() + pos;
PRUint32 bufSize = end - str;
// We use sizeof(_tagstr) below because that's the length of _tagstr
// with the one char " " or ">" appended.
#define MATCHES_TAG(_tagstr) \
(PL_strncasecmp(strPtr, _tagstr " ", sizeof(_tagstr)) == 0 || \
PL_strncasecmp(strPtr, _tagstr ">", sizeof(_tagstr)) == 0)
(bufSize >= sizeof(_tagstr) && \
(PL_strncasecmp(str, _tagstr " ", sizeof(_tagstr)) == 0 || \
PL_strncasecmp(str, _tagstr ">", sizeof(_tagstr)) == 0))
if (MATCHES_TAG("html") ||
MATCHES_TAG("frameset") ||