fix($animate): do not get affected by custom, enumerable properties on Object.prototype

gkalpak · gkalpak · commit 6050f0be3067 · 2016-06-27T11:44:37.000+03:00
Fixes angular#14804 Closes angular#14830
diff --git a/src/ngAnimate/animateQueue.js b/src/ngAnimate/animateQueue.js
@@ -158,7 +158,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
       }
     );
 
-    var callbackRegistry = {};
+    var callbackRegistry = Object.create(null);
 
     // remember that the classNameFilter is set during the provider/config
     // stage therefore we can optimize here and setup a helper function
diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js
@@ -1989,6 +1989,17 @@ describe("animations", function() {
       expect(count).toBe(5);
     }));
 
+    it('should not get affected by custom, enumerable properties on `Object.prototype`',
+      inject(function($animate) {
+        Object.prototype.foo = 'ENUMARABLE_AND_NOT_AN_ARRAY';
+
+        element = jqLite('<div></div>');
+        expect(function() { $animate.off(element); }).not.toThrow();
+
+        delete Object.prototype.foo;
+      })
+    );
+
     it('should fire a `start` callback when the animation starts with the matching element',
       inject(function($animate, $rootScope, $rootElement, $document) {
 

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {`
`158`	`158`	`}`
`159`	`159`	`);`
`160`	`160`
`161`		`- var callbackRegistry = {};`
	`161`	`+ var callbackRegistry = Object.create(null);`
`162`	`162`
`163`	`163`	`// remember that the classNameFilter is set during the provider/config`
`164`	`164`	`// stage therefore we can optimize here and setup a helper function`