summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorrmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 06:38:08 +0000
committerrmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 06:38:08 +0000
commit91a15b977c39cc06ae574ec779cf0a862aa1e102 (patch)
tree9f26dd042c4cba2011e7d003984d45a095aa8193 /remoting
parent885f2672a9eb8d063c56ac18b2772f80cb4bb868 (diff)
downloadchromium_src-91a15b977c39cc06ae574ec779cf0a862aa1e102.zip
chromium_src-91a15b977c39cc06ae574ec779cf0a862aa1e102.tar.gz
chromium_src-91a15b977c39cc06ae574ec779cf0a862aa1e102.tar.bz2
Fix index out of bounds in host_main
BUG= Review URL: https://chromiumcodereview.appspot.com/22989002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/host_main.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc
index 25e01e6..bf3dc17 100644
--- a/remoting/host/host_main.cc
+++ b/remoting/host/host_main.cc
@@ -234,14 +234,15 @@ int HostMain(int argc, char** argv) {
// missing and the first argument looks like an origin that represents
// an extension.
CommandLine::StringVector args = command_line->GetArgs();
+ if (!args.empty()) {
#if defined(OS_WIN)
- std::string origin = UTF16ToUTF8(args[0]);
+ std::string origin = UTF16ToUTF8(args[0]);
#else
- std::string origin = args[0];
+ std::string origin = args[0];
#endif
- if (!args.empty() &&
- StartsWithASCII(origin, kExtensionOriginPrefix, true)) {
- process_type = kProcessTypeNativeMessagingHost;
+ if (StartsWithASCII(origin, kExtensionOriginPrefix, true)) {
+ process_type = kProcessTypeNativeMessagingHost;
+ }
}
}