From 3a4119734053fb83ac22305be9c223b54a31221a Mon Sep 17 00:00:00 2001 From: "cata%netscape.com" Date: Thu, 21 Oct 1999 22:25:44 +0000 Subject: [PATCH] bug #16754, r=erik, fixing memory leak --- intl/uconv/src/nsCharsetMenu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/intl/uconv/src/nsCharsetMenu.cpp b/intl/uconv/src/nsCharsetMenu.cpp index 4caef3e38bc1..02224ce05659 100644 --- a/intl/uconv/src/nsCharsetMenu.cpp +++ b/intl/uconv/src/nsCharsetMenu.cpp @@ -115,7 +115,7 @@ public: { if (!uri) return NS_ERROR_NULL_POINTER; - *uri = nsXPIDLCString::Copy("rdf:window-mediator"); + *uri = nsXPIDLCString::Copy("rdf:charset-menu"); if (!(*uri)) return NS_ERROR_OUT_OF_MEMORY; return NS_OK; @@ -376,7 +376,7 @@ void nsCharsetMenu::InitInfoArray(void) void nsCharsetMenu::DeleteInfoArray(void) { for (int i = 0; i < mInfoSize; i++) delete mInfoArray[i]; - if (mInfoArray != NULL) delete mInfoArray; + if (mInfoArray != NULL) delete [] mInfoArray; } void nsCharsetMenu::AddToInfoArray(CharsetInfo *** aArray, @@ -398,6 +398,7 @@ void nsCharsetMenu::AddToInfoArray(CharsetInfo *** aArray, *aCapacity *= 2; CharsetInfo ** newArray = new CharsetInfo * [*aCapacity]; for (i = 0; i < *aSize; i++) newArray[i] = (*aArray)[i]; + delete [] *aArray; *aArray = newArray; }