Skip to content

Commit 9e9bdbd

Browse files
committed
JSON parser is now strict (ie, expressions are not allowed for security)
Close angular#57
1 parent 352dbfa commit 9e9bdbd

11 files changed

Lines changed: 384 additions & 345 deletions

File tree

src/Angular.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ function inherit(parent, extra) {
9999

100100
function noop() {}
101101
function identity($) {return $;}
102+
function valueFn(value) {return function(){ return value; };}
102103
function extensionMap(angular, name, transform) {
103104
var extPoint;
104105
return angular[name] || (extPoint = angular[name] = function (name, fn, prop){

src/JSON.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ function toJson(obj, pretty){
99
function fromJson(json) {
1010
if (!json) return json;
1111
try {
12-
var parser = new Parser(json, true);
13-
var expression = parser.primary();
14-
parser.assertAllConsumed();
12+
var p = parser(json, true);
13+
var expression = p.primary();
14+
p.assertAllConsumed();
1515
return expression();
1616
} catch (e) {
1717
error("fromJson error: ", json, e);

0 commit comments

Comments
 (0)