Commite314db1

flytreeleft

authored and

yyx990803

committed

Fix error when recursively traverse an object (vuejs#2686)

* fix 'Maximum call stack size exceeded' when recursively traverse an object* remove semicolon* simplify assignment expression* add unit test for circular references detected in Watcher#traverse

1 parentcfad423 commite314db1Copy full SHA for e314db1

File tree

2 files changed

+31

-3

lines changed

src
- watcher.js
test/unit/specs
- watcher_spec.js

2 files changed

+31

-3

lines changed

`‎src/watcher.js‎`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -334,14 +334,25 @@ Watcher.prototype.teardown = function () {`
`334`	`334`	`@param {} val`
`335`	`335`	`*/`
`336`	`336`
`337`		`-functiontraverse(val){`
	`337`	`+functiontraverse(val,walkedObjs){`
`338`	`338`	`vari,keys`
	`339`	`+`
	`340`	`+walkedObjs=walkedObjs\|\|{}`
`339`	`341`	`if(isArray(val)){`
`340`	`342`	`i=val.length`
`341`		`-while(i--)traverse(val[i])`
	`343`	`+while(i--)traverse(val[i],walkedObjs)`
`342`	`344`	`}elseif(isObject(val)){`
	`345`	`+if(val.__ob__){`
	`346`	`+vardepId=val.__ob__.dep.id`
	`347`	`+if(walkedObjs[depId]){`
	`348`	`+return`
	`349`	`+}else{`
	`350`	`+walkedObjs[depId]=true`
	`351`	`+}`
	`352`	`+}`
	`353`	`+`
`343`	`354`	`keys=Object.keys(val)`
`344`	`355`	`i=keys.length`
`345`		`-while(i--)traverse(val[keys[i]])`
	`356`	`+while(i--)traverse(val[keys[i]],walkedObjs)`
`346`	`357`	`}`
`347`	`358`	`}`

`‎test/unit/specs/watcher_spec.js‎`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,23 @@ describe('Watcher', function () {`
`286`	`286`	`})`
`287`	`287`	`})`
`288`	`288`
	`289`	`+it('deep watch with circular references',function(done){`
	`290`	`+newWatcher(vm,'b',spy,{`
	`291`	`+deep:true`
	`292`	`+})`
	`293`	`+Vue.set(vm.b,'_',vm.b)`
	`294`	`+nextTick(function(){`
	`295`	`+expect(spy).toHaveBeenCalledWith(vm.b,vm.b)`
	`296`	`+expect(spy.calls.count()).toBe(1)`
	`297`	`+vm.b._.c=1`
	`298`	`+nextTick(function(){`
	`299`	`+expect(spy).toHaveBeenCalledWith(vm.b,vm.b)`
	`300`	`+expect(spy.calls.count()).toBe(2)`
	`301`	`+done()`
	`302`	`+})`
	`303`	`+})`
	`304`	`+})`
	`305`	`+`
`289`	`306`	`it('fire change for prop addition/deletion in non-deep mode',function(done){`
`290`	`307`	`newWatcher(vm,'b',spy)`
`291`	`308`	`Vue.set(vm.b,'e',123)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite314db1

File tree

2 files changed

2 files changed

`‎src/watcher.js‎`

`‎test/unit/specs/watcher_spec.js‎`

0 commit comments