From a0a82bdf9dd69192561c548facfdaf978a359fa8 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sun, 4 Jul 2004 11:01:50 +0000 Subject: [PATCH] nsCmdLineService::GetProgramName needs to copy the string to be compliant with the interface definition. Bug 249737, r+sr=jst. git-svn-id: svn://10.0.0.236/trunk@158734 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsCommandLineService.cpp | 8 ++------ .../xpfe/components/startup/src/nsCommandLineService.cpp | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsCommandLineService.cpp b/mozilla/xpfe/appshell/src/nsCommandLineService.cpp index 5b7e5fbfc9f..2311b79b627 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineService.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineService.cpp @@ -222,12 +222,8 @@ nsCmdLineService::GetURLToLoad(char ** aResult) NS_IMETHODIMP nsCmdLineService::GetProgramName(char ** aResult) { - nsresult rv = NS_OK; - - *aResult = (char *)mArgValueList.SafeElementAt(0); - - return rv; - + *aResult = nsCRT::strdup((char *)mArgValueList.SafeElementAt(0)); + return NS_OK; } PRBool nsCmdLineService::ArgsMatch(const char *lookingFor, const char *userGave) diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp index 5b7e5fbfc9f..2311b79b627 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp @@ -222,12 +222,8 @@ nsCmdLineService::GetURLToLoad(char ** aResult) NS_IMETHODIMP nsCmdLineService::GetProgramName(char ** aResult) { - nsresult rv = NS_OK; - - *aResult = (char *)mArgValueList.SafeElementAt(0); - - return rv; - + *aResult = nsCRT::strdup((char *)mArgValueList.SafeElementAt(0)); + return NS_OK; } PRBool nsCmdLineService::ArgsMatch(const char *lookingFor, const char *userGave)