From 5cf6c6802765a877098f3ca7fe23d4e79fb3f1ad Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Thu, 11 Mar 1999 22:58:25 +0000
Subject: [PATCH] purify fixes from bruce@cybersight.com

---
 htmlparser/src/nsHTMLNullSink.cpp        |  2 +-
 htmlparser/src/nsHTMLTokens.cpp          |  2 +-
 htmlparser/src/nsScanner.cpp             |  2 +-
 parser/htmlparser/src/nsHTMLNullSink.cpp |  2 +-
 parser/htmlparser/src/nsHTMLTokens.cpp   |  2 +-
 parser/htmlparser/src/nsScanner.cpp      |  2 +-
 xpfe/xpviewer/src/nsBrowserWindow.cpp    | 24 ++++++++++++------------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htmlparser/src/nsHTMLNullSink.cpp b/htmlparser/src/nsHTMLNullSink.cpp
index 8de2dd9273a4..99adbe681719 100644
--- a/htmlparser/src/nsHTMLNullSink.cpp
+++ b/htmlparser/src/nsHTMLNullSink.cpp
@@ -123,7 +123,7 @@ static void DebugDump(const char* str1,const nsString& str2,PRInt32 tabs) {
     cout << " "; //add some tabbing to debug output...
   char* cp = str2.ToNewCString();
   cout << str1 << cp << ">" << endl;
-  delete cp;
+  delete[] cp;
 }
 #endif
 
diff --git a/htmlparser/src/nsHTMLTokens.cpp b/htmlparser/src/nsHTMLTokens.cpp
index e5a5dedf75c5..a8fe2c2613c8 100644
--- a/htmlparser/src/nsHTMLTokens.cpp
+++ b/htmlparser/src/nsHTMLTokens.cpp
@@ -1405,7 +1405,7 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
 void CEntityToken::DebugDumpSource(ostream& out) {
   char* cp=mTextValue.ToNewCString();
   out << "&" << *cp;
-  delete cp;
+  delete[] cp;
 }
 
 /*
diff --git a/htmlparser/src/nsScanner.cpp b/htmlparser/src/nsScanner.cpp
index efe74c839069..206574ff8ec0 100644
--- a/htmlparser/src/nsScanner.cpp
+++ b/htmlparser/src/nsScanner.cpp
@@ -258,7 +258,7 @@ PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
     PRUnichar *unichars = new PRUnichar [ unicharLength ];
     nsresult res = mUnicodeDecoder->Convert(unichars, 0, &unicharLength,aBuffer, 0, &srcLength );
     mBuffer.Append(unichars, unicharLength);
-    delete unichars;
+    delete[] unichars;
     mTotalRead += unicharLength;
   }
   else {
diff --git a/parser/htmlparser/src/nsHTMLNullSink.cpp b/parser/htmlparser/src/nsHTMLNullSink.cpp
index 8de2dd9273a4..99adbe681719 100644
--- a/parser/htmlparser/src/nsHTMLNullSink.cpp
+++ b/parser/htmlparser/src/nsHTMLNullSink.cpp
@@ -123,7 +123,7 @@ static void DebugDump(const char* str1,const nsString& str2,PRInt32 tabs) {
     cout << " "; //add some tabbing to debug output...
   char* cp = str2.ToNewCString();
   cout << str1 << cp << ">" << endl;
-  delete cp;
+  delete[] cp;
 }
 #endif
 
diff --git a/parser/htmlparser/src/nsHTMLTokens.cpp b/parser/htmlparser/src/nsHTMLTokens.cpp
index e5a5dedf75c5..a8fe2c2613c8 100644
--- a/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -1405,7 +1405,7 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
 void CEntityToken::DebugDumpSource(ostream& out) {
   char* cp=mTextValue.ToNewCString();
   out << "&" << *cp;
-  delete cp;
+  delete[] cp;
 }
 
 /*
diff --git a/parser/htmlparser/src/nsScanner.cpp b/parser/htmlparser/src/nsScanner.cpp
index efe74c839069..206574ff8ec0 100644
--- a/parser/htmlparser/src/nsScanner.cpp
+++ b/parser/htmlparser/src/nsScanner.cpp
@@ -258,7 +258,7 @@ PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
     PRUnichar *unichars = new PRUnichar [ unicharLength ];
     nsresult res = mUnicodeDecoder->Convert(unichars, 0, &unicharLength,aBuffer, 0, &srcLength );
     mBuffer.Append(unichars, unicharLength);
-    delete unichars;
+    delete[] unichars;
     mTotalRead += unicharLength;
   }
   else {
diff --git a/xpfe/xpviewer/src/nsBrowserWindow.cpp b/xpfe/xpviewer/src/nsBrowserWindow.cpp
index 7d54fef1e6ec..5077290a38c9 100644
--- a/xpfe/xpviewer/src/nsBrowserWindow.cpp
+++ b/xpfe/xpviewer/src/nsBrowserWindow.cpp
@@ -811,7 +811,7 @@ nsBrowserWindow::DoFileOpen()
 
     // Ask the Web widget to load the file URL
     mWebShell->LoadURL(nsString(lpszFileURL));
-    delete lpszFileURL;
+    delete[] lpszFileURL;
   }
 }
 
@@ -2429,7 +2429,7 @@ nsBrowserWindow::OnProgress(nsIURL* aURL,
       PRUnichar* str;
       aURL->ToString(&str);
       url = str;
-      delete str;
+      delete[] str;
     }
     url.Append(": progress ");
     url.Append(aProgress, 10);
@@ -2461,7 +2461,7 @@ nsBrowserWindow::OnStartBinding(nsIURL* aURL, const char *aContentType)
       PRUnichar* str;
       aURL->ToString(&str);
       url = str;
-      delete str;
+      delete[] str;
     }
     url.Append(": start");
     SetStatus(url);
@@ -2480,7 +2480,7 @@ nsBrowserWindow::OnStopBinding(nsIURL* aURL,
     PRUnichar* str;
     aURL->ToString(&str);
     url = str;
-    delete str;
+    delete[] str;
   }
   url.Append(": stop");
   SetStatus(url);
@@ -2496,7 +2496,7 @@ nsBrowserWindow::Alert(const nsString &aText)
 
   str = aText.ToNewCString();
   printf("Browser Window Alert: %c%s\n", '\007', str);
-  PR_Free(str);
+  delete[] str;
 }
 
 //----------------------------------------
@@ -2507,7 +2507,7 @@ nsBrowserWindow::Confirm(const nsString &aText)
 
   str = aText.ToNewCString();
   printf("%cBrowser Window Confirm: %s (y/n)? ", '\007', str);
-  PR_Free(str);
+  delete[] str;
   char c;
   for (;;) {
     c = getchar();
@@ -2531,7 +2531,7 @@ nsBrowserWindow::Prompt(const nsString &aText,
 
   str = aText.ToNewCString();
   printf("Browser Window: %s\n", str);
-  PR_Free(str);
+  delete[] str;
 
   str = aDefault.ToNewCString();
   printf("%cPrompt (default=%s): ", '\007', str);
@@ -2541,7 +2541,7 @@ nsBrowserWindow::Prompt(const nsString &aText,
   } else {
     aResult = aDefault;
   }
-  PR_Free(str);
+  delete[] str;
   
   return (aResult.Length() > 0);
 }
@@ -2557,7 +2557,7 @@ nsBrowserWindow::PromptUserAndPassword(const nsString &aText,
 
   str = aText.ToNewCString();
   printf("Browser Window: %s\n", str);
-  PR_Free(str);
+  delete[] str;
 
   str = aUser.ToNewCString();
   printf("%cUser (default=%s): ", '\007', str);
@@ -2565,7 +2565,7 @@ nsBrowserWindow::PromptUserAndPassword(const nsString &aText,
   if (strlen(buf)) {
     aUser = buf;
   }
-  PR_Free(str);
+  delete[] str;
 
   str = aPassword.ToNewCString();
   printf("%cPassword (default=%s): ", '\007', str);
@@ -2573,7 +2573,7 @@ nsBrowserWindow::PromptUserAndPassword(const nsString &aText,
   if (strlen(buf)) {
     aPassword = buf;
   }
-  PR_Free(str);
+  delete[] str;
   
   return (aUser.Length() > 0);
 }
@@ -2588,7 +2588,7 @@ nsBrowserWindow::PromptPassword(const nsString &aText,
   
   str = aText.ToNewCString();
   printf("Browser Window: %s\n", str);
-  PR_Free(str);
+  delete[] str;
 
   printf("%cPassword: ", '\007');
   gets(buf);