Code Reviewed. r=dveditz.
git-svn-id: svn://10.0.0.236/trunk@60670 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -127,6 +127,8 @@ nsTimeBomb::Init()
|
||||
NS_IMETHODIMP
|
||||
nsTimeBomb::CheckWithUI(PRBool *expired)
|
||||
{
|
||||
if (!mPrefs) return NS_ERROR_NULL_POINTER;
|
||||
|
||||
*expired = PR_FALSE;
|
||||
|
||||
PRBool val;
|
||||
@@ -165,8 +167,9 @@ NS_IMETHODIMP
|
||||
nsTimeBomb::LoadUpdateURL()
|
||||
{
|
||||
char* url;
|
||||
GetTimebombURL(&url);
|
||||
nsresult rv = DisplayURI(url, PR_FALSE);
|
||||
nsresult rv = GetTimebombURL(&url);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
rv = DisplayURI(url, PR_FALSE);
|
||||
nsAllocator::Free(url);
|
||||
return rv;
|
||||
}
|
||||
@@ -329,6 +332,9 @@ nsTimeBomb::GetTimebombURL(char* *url)
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
*url = (char*)nsAllocator::Clone(string, (strlen(string)+1)*sizeof(char));
|
||||
|
||||
PL_strfree(string);
|
||||
|
||||
if(*url)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
return NS_OK;
|
||||
@@ -337,7 +343,7 @@ nsTimeBomb::GetTimebombURL(char* *url)
|
||||
string = "http://www.mozilla.org/projects/seamonkey/";
|
||||
*url = (char*)nsAllocator::Clone(string, (strlen(string)+1)*sizeof(char));
|
||||
|
||||
if(*url)
|
||||
if(!*url)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
return NS_OK;
|
||||
|
||||
Reference in New Issue
Block a user