17237 - FMM: CWellFormedDTD::HandleErrorToken()

Status: VERIFIED FIXED

(Core :: DOM: HTML Parser, defect, P3)

Description

[Bruce Mitchener]

CWellFormedDTD::HandleErrorToken() does delete[] on the result of
nsString::ToNewCString().  It should be using the correct API whatever that
happens to be.

Comment 1

[rickg]

Nisheeth -- this was yours, but I've fixed it and provided the new
implementation for you to review. You need to call Recycle(xxx) on char*'s
returned by ToNewCString:

nsresult CWellFormedDTD::HandleErrorToken(CToken* aToken) {
  NS_PRECONDITION(0!=aToken,"null token");

  nsresult result=NS_OK;

  // Propagate the error onto the content sink.
  CErrorToken *errTok = (CErrorToken *)aToken;

  // XXX Dump error to error output stream just in case the content
  // sink is RDF or XUL and does not implement error handling.  We need to
factor
  // code better among HTMLContentSink, XMLContentSink, RDFContentSink,
  // and XULContentSink.  Until that happens, instead of cutting and
  // pasting error handling code for each content sink, I output an
  // error to cerr here.
  const nsParserError* error = errTok->GetError();
  if (error) {
    char* temp;
    cerr << "XML Error in file '" << (temp = mFilename.ToNewCString()) << "', ";
    Recycle(temp);
    cerr << "Line Number: " << error->lineNumber << ", ";
    cerr << "Col Number: " << error->colNumber << ", ";
    cerr << "Description: " << (temp = error->description.ToNewCString()) <<
"\n";
    Recycle(temp);
    cerr << "Source Line: " << (temp = error->sourceLine.ToNewCString()) <<
"\n";
    Recycle(temp);
  }
  result=(mSink)? mSink->NotifyError(errTok->GetError()):NS_OK;
  return result;
}

Comment 2

[Nisheeth Ranjan]

Thanks for the patch, Rick.  I guess when I wrote this code, I didn't realize
that nsString provides a function to recycle char*'s.  Sorry!  I'll check your
patch in once the tree opens today.

Comment 3

[Nisheeth Ranjan]

The fix is checked in.

Comment 4

[bsharma]

updated qa contact.

Comment 5

[bsharma]

Marking verified as per the above developer comments.