cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): disallow references for select and index evaluation

Browse Source 
Also fixes an issue where enum values of 0 or '``' where not treated
correctly.

Fixes: #18170
This commit is contained in:
Chuck Jazdzewski
2017-09-29 11:51:08 -07:00
committed by Alex Rickabaugh
parent 9ae3742565
commit f3f4c3d835
2 changed files with 152 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/compiler/src/aot/static_reflector.ts
View File

@ -444,7 +444,7 @@ export class StaticReflector implements CompileReflector {
} else {
const staticSymbol = expression;
const declarationValue = resolveReferenceValue(staticSymbol);
if (declarationValue) {
if (declarationValue != null) {
return simplifyInContext(staticSymbol, declarationValue, depth + 1, references);
} else {
return staticSymbol;
@ -522,8 +522,8 @@ export class StaticReflector implements CompileReflector {
}
return null;
case 'index':
let indexTarget = simplify(expression['expression']);
let index = simplify(expression['index']);
let indexTarget = simplifyInContext(context, expression['expression'], depth, 0);
let index = simplifyInContext(context, expression['index'], depth, 0);
if (indexTarget && isPrimitive(index)) return indexTarget[index];
return null;
case 'select':
@ -535,7 +535,7 @@ export class StaticReflector implements CompileReflector {
selectContext =
self.getStaticSymbol(selectTarget.filePath, selectTarget.name, members);
const declarationValue = resolveReferenceValue(selectContext);
if (declarationValue) {
if (declarationValue != null) {
return simplifyInContext(
selectContext, declarationValue, depth + 1, references);
} else {