Skip to content

Fix for #684, null dereference for incomplete for loop analysis #743

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

Merged
mousetraps merged 4 commits into from
Mar 29, 2016
Merged

Fix for #684, null dereference for incomplete for loop analysis #743

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd94659
Fix for #684, null dereference for incomplete for loop
mjbvz Mar 11, 2016
6e57bde
Use external check for null variable declarations
mjbvz Mar 28, 2016
9f4aac5
Merge branch 'master' into forloop-null-fix
mjbvz Mar 29, 2016
699f8fc
Remove using statement, remove null check
mjbvz Mar 29, 2016
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
17 changes: 10 additions & 7 deletions Nodejs/Product/Analysis/JavaScript/jsparser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Reflection;
using System.Runtime.Serialization;
using Microsoft.Ajax.Utilities;


namespace Microsoft.NodejsTools.Parsing
{
/// <summary>
Expand Down Expand Up @@ -1086,7 +1085,7 @@ private Statement ParseForStatement()
Statement lhs = null;
Statement initializer = null;
int headerEnd = -1;
List<VariableDeclaration> varList = new List<VariableDeclaration>();
var varList = new List<VariableDeclaration>();
try
{
if (JSToken.Var == _curToken
Expand All @@ -1108,16 +1107,20 @@ private Statement ParseForStatement()
}

var varInitializer = ParseIdentifierInitializer(JSToken.In);
varList.Add(varInitializer);
UpdateWithOtherNode(declaration, varInitializer);
if (varInitializer != null) {
varList.Add(varInitializer);
UpdateWithOtherNode(declaration, varInitializer);
}

// a list of variable initializers is allowed only in a for(;;)
while (JSToken.Comma == _curToken)
{
isForIn = false;
varInitializer = ParseIdentifierInitializer(JSToken.In);
varList.Add(varInitializer);
UpdateWithOtherNode(declaration, initializer);
if (varInitializer != null) {
varList.Add(varInitializer);
UpdateWithOtherNode(declaration, initializer);
}
//initializer = new Comma(initializer.context.CombineWith(var.context), initializer, var);
}

Expand Down