summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 22:53:22 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 22:53:22 +0000
commitdb343035f369d9da377762f784fc3a7ddabaecf6 (patch)
tree6434deae671a9f99a75157094553942e8d76edbc /chrome/installer
parenteb02ccd621ed3c8d575e2398b15e933ef3963ad6 (diff)
downloadchromium_src-db343035f369d9da377762f784fc3a7ddabaecf6.zip
chromium_src-db343035f369d9da377762f784fc3a7ddabaecf6.tar.gz
chromium_src-db343035f369d9da377762f784fc3a7ddabaecf6.tar.bz2
Avoid a first-chance access violation a few lines down that happens
when you lstrcat a NULL string (in the case where there are no additional parameters). BUG=none TEST=windbg mini_installer.exe, should see no first-chance access violation Review URL: http://codereview.chromium.org/408012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32424 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/mini_installer/mini_installer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index ff913f2..488afde 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -406,7 +406,7 @@ void AppendCommandLineFlags(wchar_t* buffer, int size) {
if (args_num <= 0)
return;
- wchar_t* cmd_to_append = NULL;
+ wchar_t* cmd_to_append = L"";
if (!StrEndsWith(args[0], exe_name)) {
// Current executable name not in the command line so just append
// the whole command line.