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

Expat's switch to unicode buffers confused the error reporting code. Fixed.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@28695 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nisheeth%netscape.com 1999-04-22 09:25:31 +00:00
parent 9f3f1ef921
commit 0f36734d11
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/htmlparser/src/nsExpatTokenizer.cpp
View File

@ -139,7 +139,7 @@ nsExpatTokenizer::nsExpatTokenizer() : nsHTMLTokenizer() {
if (mExpatParser) { if (mExpatParser) {
SetupExpatCallbacks(); SetupExpatCallbacks();
} }
} }
} }
/** /**
@ -168,28 +168,32 @@ void nsExpatTokenizer::SetErrorContextInfo(nsParserError* aError, PRUint32 aByte
/* Figure out the substring inside aSourceBuffer that contains the line on which the error /* Figure out the substring inside aSourceBuffer that contains the line on which the error
occurred. Copy the line into aError->sourceLine */ occurred. Copy the line into aError->sourceLine */
PR_ASSERT(aByteIndex > 0 && aByteIndex < aLength); PR_ASSERT(aByteIndex > 0 && aByteIndex < aLength);
char* start = (char* ) &aSourceBuffer[aByteIndex]; /* Will try to find the start of the line */ /* Assert that the byteIndex and the length of the buffer is even */
char* end = (char* ) &aSourceBuffer[aByteIndex]; /* Will try to find the end of the line */ PR_ASSERT(aByteIndex % 2 == 0 && aLength % 2 == 0);
PRUint32 startIndex = aByteIndex; /* Track the position of the 'start' pointer into the buffer */ PRUnichar* start = (PRUnichar* ) &aSourceBuffer[aByteIndex]; /* Will try to find the start of the line */
PRUint32 endIndex = aByteIndex; /* Track the position of the 'end' pointer into the buffer */ PRUnichar* end = (PRUnichar* ) &aSourceBuffer[aByteIndex]; /* Will try to find the end of the line */
PRUint32 startIndex = aByteIndex / 2; /* Track the position of the 'start' pointer into the buffer */
PRUint32 endIndex = aByteIndex / 2; /* Track the position of the 'end' pointer into the buffer */
PRUint32 numCharsInBuffer = aLength / 2;
PRBool reachedStart; PRBool reachedStart;
PRBool reachedEnd; PRBool reachedEnd;
/* Use start to find the first new line before the error position and /* Use start to find the first new line before the error position and
end to find the first new line after the error position */ end to find the first new line after the error position */
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0); reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= aLength); reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= numCharsInBuffer);
while (!reachedStart || !reachedEnd) { while (!reachedStart || !reachedEnd) {
if (!reachedStart) { if (!reachedStart) {
start--; start--;
startIndex--; startIndex--;
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
} }
if (!reachedEnd) { if (!reachedEnd) {
end++; end++;
endIndex++; endIndex++;
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= numCharsInBuffer);
} }
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= aLength);
} }
if (startIndex == endIndex) { if (startIndex == endIndex) {
@ -201,11 +205,7 @@ void nsExpatTokenizer::SetErrorContextInfo(nsParserError* aError, PRUint32 aByte
/* At this point, the substring starting at (startIndex + 1) and ending at (endIndex - 1), /* At this point, the substring starting at (startIndex + 1) and ending at (endIndex - 1),
is the line on which the error occurred. Copy that substring into the error structure. */ is the line on which the error occurred. Copy that substring into the error structure. */
char* tempLine = new char[endIndex - startIndex]; aError->sourceLine.Append((const PRUnichar* )&aSourceBuffer[startIndex + (1 * sizeof(XML_Char))], (endIndex - 1) - startIndex);
strncpy(tempLine, &aSourceBuffer[startIndex + 1], (endIndex - 1) - startIndex);
tempLine[endIndex - startIndex - 1] = '\0';
aError->sourceLine.Append(tempLine);
delete [] tempLine;
} }
} }

26
mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
View File

@ -139,7 +139,7 @@ nsExpatTokenizer::nsExpatTokenizer() : nsHTMLTokenizer() {
if (mExpatParser) { if (mExpatParser) {
SetupExpatCallbacks(); SetupExpatCallbacks();
} }
} }
} }
/** /**
@ -168,28 +168,32 @@ void nsExpatTokenizer::SetErrorContextInfo(nsParserError* aError, PRUint32 aByte
/* Figure out the substring inside aSourceBuffer that contains the line on which the error /* Figure out the substring inside aSourceBuffer that contains the line on which the error
occurred. Copy the line into aError->sourceLine */ occurred. Copy the line into aError->sourceLine */
PR_ASSERT(aByteIndex > 0 && aByteIndex < aLength); PR_ASSERT(aByteIndex > 0 && aByteIndex < aLength);
char* start = (char* ) &aSourceBuffer[aByteIndex]; /* Will try to find the start of the line */ /* Assert that the byteIndex and the length of the buffer is even */
char* end = (char* ) &aSourceBuffer[aByteIndex]; /* Will try to find the end of the line */ PR_ASSERT(aByteIndex % 2 == 0 && aLength % 2 == 0);
PRUint32 startIndex = aByteIndex; /* Track the position of the 'start' pointer into the buffer */ PRUnichar* start = (PRUnichar* ) &aSourceBuffer[aByteIndex]; /* Will try to find the start of the line */
PRUint32 endIndex = aByteIndex; /* Track the position of the 'end' pointer into the buffer */ PRUnichar* end = (PRUnichar* ) &aSourceBuffer[aByteIndex]; /* Will try to find the end of the line */
PRUint32 startIndex = aByteIndex / 2; /* Track the position of the 'start' pointer into the buffer */
PRUint32 endIndex = aByteIndex / 2; /* Track the position of the 'end' pointer into the buffer */
PRUint32 numCharsInBuffer = aLength / 2;
PRBool reachedStart; PRBool reachedStart;
PRBool reachedEnd; PRBool reachedEnd;
/* Use start to find the first new line before the error position and /* Use start to find the first new line before the error position and
end to find the first new line after the error position */ end to find the first new line after the error position */
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0); reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= aLength); reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= numCharsInBuffer);
while (!reachedStart || !reachedEnd) { while (!reachedStart || !reachedEnd) {
if (!reachedStart) { if (!reachedStart) {
start--; start--;
startIndex--; startIndex--;
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
} }
if (!reachedEnd) { if (!reachedEnd) {
end++; end++;
endIndex++; endIndex++;
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= numCharsInBuffer);
} }
reachedStart = ('\n' == *start || '\r' == *start || startIndex <= 0);
reachedEnd = ('\n' == *end || '\r' == *end || endIndex >= aLength);
} }
if (startIndex == endIndex) { if (startIndex == endIndex) {
@ -201,11 +205,7 @@ void nsExpatTokenizer::SetErrorContextInfo(nsParserError* aError, PRUint32 aByte
/* At this point, the substring starting at (startIndex + 1) and ending at (endIndex - 1), /* At this point, the substring starting at (startIndex + 1) and ending at (endIndex - 1),
is the line on which the error occurred. Copy that substring into the error structure. */ is the line on which the error occurred. Copy that substring into the error structure. */
char* tempLine = new char[endIndex - startIndex]; aError->sourceLine.Append((const PRUnichar* )&aSourceBuffer[startIndex + (1 * sizeof(XML_Char))], (endIndex - 1) - startIndex);
strncpy(tempLine, &aSourceBuffer[startIndex + 1], (endIndex - 1) - startIndex);
tempLine[endIndex - startIndex - 1] = '\0';
aError->sourceLine.Append(tempLine);
delete [] tempLine;
} }
} }