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

don't addref a null ptr, that hurts!

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@34686 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ducarroz%netscape.com
1999-06-10 23:31:44 +00:00
parent a9b121ca89
commit eb58989f6b
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mozilla/mailnews/compose/src/nsMsgComposeService.cpp
View File

@@ -40,14 +40,14 @@ nsMsgComposeService::nsMsgComposeService()
NS_INIT_REFCNT();
rv = NS_NewISupportsArray(getter_AddRefs(m_msgQueue));
/*--- tempory hack ---*/
/*--- temporary hack ---*/
int i;
for (i = 0; i < 16; i ++)
{
hack_uri[i] = "";
hack_object[i] = nsnull;
}
/*--- tempory hack ---*/
/*--- temporary hack ---*/
}
@@ -65,17 +65,21 @@ nsresult nsMsgComposeService::OpenComposeWindow(const PRUnichar *msgComposeWindo
nsAutoString args = "";
nsresult rv;
/*--- tempory hack ---*/
int i;
for (i = 0; i < 16; i ++)
if (hack_uri[i].IsEmpty())
{
hack_uri[i] = originalMsgURI;
hack_object[i] = object;
NS_ADDREF(hack_object[i]);
break;
}
/*--- tempory hack ---*/
/*--- temporary hack ---*/
if (originalMsgURI)
{
int i;
for (i = 0; i < 16; i ++)
if (hack_uri[i].IsEmpty())
{
hack_uri[i] = originalMsgURI;
hack_object[i] = object;
if (hack_object[i])
NS_ADDREF(hack_object[i]);
break;
}
}
/*--- temporary hack ---*/
NS_WITH_SERVICE(nsIDOMToolkitCore, toolkitCore, kToolkitCoreCID, &rv);
if (NS_FAILED(rv))
@@ -114,26 +118,27 @@ nsresult nsMsgComposeService::InitCompose(nsIDOMWindow *aWindow, const PRUnichar
(void **) &msgCompose);
if (NS_SUCCEEDED(rv) && msgCompose)
{
/*--- tempory hack ---*/
/*--- temporary hack ---*/
int i;
nsISupports * object = nsnull;
for (i = 0; i < 16; i ++)
if (hack_uri[i] == originalMsgURI)
{
hack_uri[i] = "";
object = hack_object[i];
hack_object[i] = nsnull;
break;
}
/*--- tempory hack ---*/
if (originalMsgURI)
for (i = 0; i < 16; i ++)
if (hack_uri[i] == originalMsgURI)
{
hack_uri[i] = "";
object = hack_object[i];
hack_object[i] = nsnull;
break;
}
/*--- temporary hack ---*/
msgCompose->Initialize(aWindow, originalMsgURI, type, format, object);
m_msgQueue->AppendElement(msgCompose);
*_retval = msgCompose;
/*--- tempory hack ---*/
/*--- temporary hack ---*/
NS_IF_RELEASE(object);
/*--- tempory hack ---*/
/*--- temporary hack ---*/
}
return rv;