Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ReactPage): Fix ApplyArguments to not fail on odd number of args (#1025) #1028

Merged
merged 2 commits into from Feb 24, 2017
Merged

fix(ReactPage): Fix ApplyArguments to not fail on odd number of args (#1025) #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e38705a
fix(ReactPage): Fix ApplyArguments to not fail on odd number of argum…
ymusiychuk-lohika Feb 21, 2017
36c2a12
Merge branch 'master' into fix-reactpage-1025
matthargett Feb 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ReactWindows/ReactNative.Net46/ReactPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,19 @@ private void ApplyArguments(string[] arguments)
return;
}

if (arguments.Length % 2 != 0)
var index = Array.IndexOf(arguments, "remoteDebugging");
if (index < 0)
{
throw new ArgumentException("Expected even number of arguments.", nameof(arguments));
return;
}

var index = Array.IndexOf(arguments, "remoteDebugging");
var isRemoteDebuggingEnabled = default(bool);
if (index % 2 == 0 && bool.TryParse(arguments[index + 1], out isRemoteDebuggingEnabled))
if (arguments.Length <= index + 1)
{
throw new ArgumentException("Expected value for remoteDebugging argument.", nameof(arguments));
}

bool isRemoteDebuggingEnabled;
if (bool.TryParse(arguments[index + 1], out isRemoteDebuggingEnabled))
{
ReactInstanceManager.DevSupportManager.IsRemoteDebuggingEnabled = isRemoteDebuggingEnabled;
}
Expand Down
16 changes: 11 additions & 5 deletions ReactWindows/ReactNative/ReactPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,20 @@ private void ApplyArguments(string arguments)
if (!string.IsNullOrEmpty(arguments))
{
var args = arguments.Split(',');
if (args.Length % 2 != 0)

var index = Array.IndexOf(args, "remoteDebugging");
if (index < 0)
{
throw new ArgumentException("Expected even number of arguments.", nameof(arguments));
return;
}

var index = Array.IndexOf(args, "remoteDebugging");
var isRemoteDebuggingEnabled = default(bool);
if (index % 2 == 0 && bool.TryParse(args[index + 1], out isRemoteDebuggingEnabled))
if (args.Length <= index + 1)
{
throw new ArgumentException("Expected value for remoteDebugging argument.", nameof(arguments));
}

bool isRemoteDebuggingEnabled;
if (bool.TryParse(args[index + 1], out isRemoteDebuggingEnabled))
{
_reactInstanceManager.DevSupportManager.IsRemoteDebuggingEnabled = isRemoteDebuggingEnabled;
}
Expand Down