From 10694e906bc1721c3b6a642cd7ea13cc3a281874 Mon Sep 17 00:00:00 2001
From: Daniel Luz <dev@mernen.com>
Date: Fri, 8 Mar 2013 01:33:57 -0300
Subject: [PATCH 1/2] fix(*): do not rely on an object's hasOwnProperty

Closes #1944
---
 src/Angular.js               | 17 ++++++++++++-----
 src/angular-bootstrap.js     |  2 +-
 src/auto/injector.js         |  4 ++--
 src/loader.js                |  2 +-
 src/ng/compile.js            |  6 +++---
 src/ng/controller.js         |  2 +-
 src/ng/directive/form.js     |  2 +-
 src/ng/directive/ngRepeat.js |  4 ++--
 src/ng/directive/select.js   |  2 +-
 src/ng/parse.js              | 10 +++++-----
 src/ng/q.js                  |  4 ++--
 src/ngResource/resource.js   |  2 +-
 test/AngularSpec.js          | 17 +++++++++++++++++
 13 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/Angular.js b/src/Angular.js
index 5d9d2e12fffe..80fe3293246e 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -2,6 +2,13 @@
 
 ////////////////////////////////////
 
+/**
+ * hasOwnProperty may be overriden by a property of the same name, or entirely
+ * absent from an object that does not inherit Object.prototype; this copy is
+ * used instead
+ */
+var hasOwn = Object.prototype.hasOwnProperty;
+
 /**
  * @ngdoc function
  * @name angular.lowercase
@@ -139,7 +146,7 @@ function forEach(obj, iterator, context) {
   if (obj) {
     if (isFunction(obj)){
       for (key in obj) {
-        if (key != 'prototype' && key != 'length' && key != 'name' && obj.hasOwnProperty(key)) {
+        if (key != 'prototype' && key != 'length' && key != 'name' && hasOwn.call(obj, key)) {
           iterator.call(context, obj[key], key);
         }
       }
@@ -150,7 +157,7 @@ function forEach(obj, iterator, context) {
         iterator.call(context, obj[key], key);
     } else {
       for (key in obj) {
-        if (obj.hasOwnProperty(key)) {
+        if (hasOwn.call(obj, key)) {
           iterator.call(context, obj[key], key);
         }
       }
@@ -162,7 +169,7 @@ function forEach(obj, iterator, context) {
 function sortedKeys(obj) {
   var keys = [];
   for (var key in obj) {
-    if (obj.hasOwnProperty(key)) {
+    if (hasOwn.call(obj, key)) {
       keys.push(key);
     }
   }
@@ -508,7 +515,7 @@ function size(obj, ownPropsOnly) {
     return obj.length;
   } else if (isObject(obj)){
     for (key in obj)
-      if (!ownPropsOnly || obj.hasOwnProperty(key))
+      if (!ownPropsOnly || hasOwn.call(obj, key))
         size++;
   }
 
@@ -609,7 +616,7 @@ function shallowCopy(src, dst) {
   dst = dst || {};
 
   for(var key in src) {
-    if (src.hasOwnProperty(key) && key.substr(0, 2) !== '$$') {
+    if (hasOwn.call(src, key) && key.substr(0, 2) !== '$$') {
       dst[key] = src[key];
     }
   }
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 86b958148c40..eaf1cd2fae88 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -191,7 +191,7 @@
 
       if (IGNORE[prop] || prop.match(/^moz[A-Z]/)) { //skip special variables which keep on changing
         continue;
-      } else if (!globalVars.hasOwnProperty(varKey)) {
+      } else if (!hasOwn.call(globalVars, varKey)) {
         //console.log('new global variable found: ', prop);
         try {
           globalVars[varKey] = window[prop];
diff --git a/src/auto/injector.js b/src/auto/injector.js
index d39e2aa9b7e6..75325c834e59 100644
--- a/src/auto/injector.js
+++ b/src/auto/injector.js
@@ -529,7 +529,7 @@ function createInjector(modulesToLoad) {
       if (typeof serviceName !== 'string') {
         throw Error('Service name expected');
       }
-      if (cache.hasOwnProperty(serviceName)) {
+      if (hasOwn.call(cache, serviceName)) {
         if (cache[serviceName] === INSTANTIATING) {
           throw Error('Circular dependency: ' + path.join(' <- '));
         }
@@ -554,7 +554,7 @@ function createInjector(modulesToLoad) {
       for(i = 0, length = $inject.length; i < length; i++) {
         key = $inject[i];
         args.push(
-          locals && locals.hasOwnProperty(key)
+          locals && hasOwn.call(locals, key)
           ? locals[key]
           : getService(key)
         );
diff --git a/src/loader.js b/src/loader.js
index ecb166085460..43ef770ec208 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -65,7 +65,7 @@ function setupModuleLoader(window) {
      * @returns {module} new module with the {@link angular.Module} api.
      */
     return function module(name, requires, configFn) {
-      if (requires && modules.hasOwnProperty(name)) {
+      if (requires && hasOwn.call(modules, name)) {
         modules[name] = null;
       }
       return ensure(modules, name, function() {
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 6606dc6c6586..ec11eaadde1b 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -177,7 +177,7 @@ function $CompileProvider($provide) {
    this.directive = function registerDirective(name, directiveFactory) {
     if (isString(name)) {
       assertArg(directiveFactory, 'directive');
-      if (!hasDirectives.hasOwnProperty(name)) {
+      if (!hasOwn.call(hasDirectives, name)) {
         hasDirectives[name] = [];
         $provide.factory(name + Suffix, ['$injector', '$exceptionHandler',
           function($injector, $exceptionHandler) {
@@ -917,7 +917,7 @@ function $CompileProvider($provide) {
      */
     function addDirective(tDirectives, name, location, maxPriority) {
       var match = false;
-      if (hasDirectives.hasOwnProperty(name)) {
+      if (hasOwn.call(hasDirectives, name)) {
         for(var directive, directives = $injector.get(name + Suffix),
             i = 0, ii = directives.length; i<ii; i++) {
           try {
@@ -964,7 +964,7 @@ function $CompileProvider($provide) {
           dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
         } else if (key == 'style') {
           $element.attr('style', $element.attr('style') + ';' + value);
-        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+        } else if (key.charAt(0) != '$' && !hasOwn.call(dst, key)) {
           dst[key] = value;
           dstAttr[key] = srcAttr[key];
         }
diff --git a/src/ng/controller.js b/src/ng/controller.js
index e2f1b6ac7ce3..9f8f33047aab 100644
--- a/src/ng/controller.js
+++ b/src/ng/controller.js
@@ -59,7 +59,7 @@ function $ControllerProvider() {
     return function(constructor, locals) {
       if(isString(constructor)) {
         var name = constructor;
-        constructor = controllers.hasOwnProperty(name)
+        constructor = hasOwn.call(controllers, name)
             ? controllers[name]
             : getter(locals.$scope, name, true) || getter($window, name, true);
 
diff --git a/src/ng/directive/form.js b/src/ng/directive/form.js
index 36b775cb3b40..537f5f0e55e8 100644
--- a/src/ng/directive/form.js
+++ b/src/ng/directive/form.js
@@ -65,7 +65,7 @@ function FormController(element, attrs) {
   form.$addControl = function(control) {
     controls.push(control);
 
-    if (control.$name && !form.hasOwnProperty(control.$name)) {
+    if (control.$name && !hasOwn.call(form, control.$name)) {
       form[control.$name] = control;
     }
   };
diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js
index c59fefacc956..c10b450b5897 100644
--- a/src/ng/directive/ngRepeat.js
+++ b/src/ng/directive/ngRepeat.js
@@ -108,7 +108,7 @@ var ngRepeatDirective = ngDirective({
           // if object, extract keys, sort them and use to determine order of iteration over obj props
           array = [];
           for(key in collection) {
-            if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
+            if (hasOwn.call(collection, key) && key.charAt(0) != '$') {
               array.push(key);
             }
           }
@@ -172,7 +172,7 @@ var ngRepeatDirective = ngDirective({
 
         //shrink children
         for (key in lastOrder) {
-          if (lastOrder.hasOwnProperty(key)) {
+          if (hasOwn.call(lastOrder, key)) {
             array = lastOrder[key];
             while(array.length) {
               value = array.pop();
diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js
index d82bd139c3b2..37442403c741 100644
--- a/src/ng/directive/select.js
+++ b/src/ng/directive/select.js
@@ -177,7 +177,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
 
 
       self.hasOption = function(value) {
-        return optionsMap.hasOwnProperty(value);
+        return hasOwn.call(optionsMap, value);
       }
 
       $scope.$on('$destroy', function() {
diff --git a/src/ng/parse.js b/src/ng/parse.js
index 4651fc100f51..f0cc8084f6b4 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -200,7 +200,7 @@ function lex(text, csp){
       text:ident
     };
 
-    if (OPERATORS.hasOwnProperty(ident)) {
+    if (hasOwn.call(OPERATORS, ident)) {
       token.fn = token.json = OPERATORS[ident];
     } else {
       var getter = getterFn(ident, csp);
@@ -732,7 +732,7 @@ var getterFnCache = {};
  */
 function cspSafeGetterFn(key0, key1, key2, key3, key4) {
   return function(scope, locals) {
-    var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
+    var pathVal = (locals && hasOwn.call(locals, key0)) ? locals : scope,
         promise;
 
     if (pathVal === null || pathVal === undefined) return pathVal;
@@ -795,7 +795,7 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4) {
 };
 
 function getterFn(path, csp) {
-  if (getterFnCache.hasOwnProperty(path)) {
+  if (hasOwn.call(getterFnCache, path)) {
     return getterFnCache[path];
   }
 
@@ -827,7 +827,7 @@ function getterFn(path, csp) {
                       // we simply dereference 's' on any .dot notation
                       ? 's'
                       // but if we are first then we check locals first, and if so read it first
-                      : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
+                      : '((k&&hasOwn.call(k,"' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
               'if (s && s.then) {\n' +
                 ' if (!("$$v" in s)) {\n' +
                   ' p=s;\n' +
@@ -892,7 +892,7 @@ function $ParseProvider() {
     return function(exp) {
       switch(typeof exp) {
         case 'string':
-          return cache.hasOwnProperty(exp)
+          return hasOwn.call(cache, exp)
             ? cache[exp]
             : cache[exp] =  parser(exp, false, $filter, $sniffer.csp);
         case 'function':
diff --git a/src/ng/q.js b/src/ng/q.js
index 6cb92102ad6b..f095e2867f6a 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -391,11 +391,11 @@ function qFactory(nextTick, exceptionHandler) {
     forEach(promises, function(promise, key) {
       counter++;
       ref(promise).then(function(value) {
-        if (results.hasOwnProperty(key)) return;
+        if (hasOwn.call(results, key)) return;
         results[key] = value;
         if (!(--counter)) deferred.resolve(results);
       }, function(reason) {
-        if (results.hasOwnProperty(key)) return;
+        if (hasOwn.call(results, key)) return;
         deferred.reject(reason);
       });
     });
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index ddd260bd1f2a..87e26a7a987c 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -337,7 +337,7 @@ angular.module('ngResource', ['ng']).
 
         params = params || {};
         forEach(self.urlParams, function(_, urlParam){
-          val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
+          val = Object.prototype.hasOwnProperty.call(params, urlParam) ? params[urlParam] : self.defaults[urlParam];
           if (angular.isDefined(val) && val !== null) {
             encodedVal = encodeUriSegment(val);
             url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), encodedVal + "$1");
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 7f1ab8a32c26..45ca99922970 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -231,6 +231,10 @@ describe('angular', function() {
       expect(size(obj, true)).toBe(3);
     });
 
+    it('when counting own properties should work well with objects that define "hasOwnProperty"', function() {
+      expect(size({hasOwnProperty: 1, foo: 2}, true)).toBe(2);
+    });
+
     it('should return the string length', function() {
       expect(size('')).toBe(0);
       expect(size('abc')).toBe(3);
@@ -357,6 +361,19 @@ describe('angular', function() {
       forEach(obj, function(value, key) { log.push(key + ':' + value)});
       expect(log).toEqual(['length:2', 'foo:bar']);
     });
+
+    it('should handle objects that define a "hasOwnProperty" key', function() {
+      var obj = {
+            foo: 1,
+            hasOwnProperty: 2
+          },
+          log = [];
+
+      forEach(obj, function(value, key) {
+        log.push(key + ':' + value);
+      });
+      expect(log).toEqual(['foo:1', 'hasOwnProperty:2']);
+    });
   });
 
 

From 6c32811c3c3b71f1aae83feaaa74e11d7e83b6b3 Mon Sep 17 00:00:00 2001
From: Daniel Luz <dev@mernen.com>
Date: Tue, 12 Mar 2013 00:47:25 -0300
Subject: [PATCH 2/2] fix(angular.equals): stricter test for key presence

Merely testing for object[key] will give incorrect results on keys
defined in Object.prototype.
---
 src/Angular.js      | 2 +-
 test/AngularSpec.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Angular.js b/src/Angular.js
index 80fe3293246e..b100328d7097 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -674,7 +674,7 @@ function equals(o1, o2) {
           keySet[key] = true;
         }
         for(key in o2) {
-          if (!keySet[key] &&
+          if (!hasOwn.call(keySet, key) &&
               key.charAt(0) !== '$' &&
               o2[key] !== undefined &&
               !isFunction(o2[key])) return false;
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 45ca99922970..556f9af9d6f8 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -211,6 +211,11 @@ describe('angular', function() {
       expect(equals(new Date(0), 0)).toBe(false);
       expect(equals(0, new Date(0))).toBe(false);
     });
+
+    it('should correctly test for keys that are present on Object.prototype', function() {
+      expect(equals({}, {hasOwnProperty: 1})).toBe(false);
+      expect(equals({}, {toString: null})).toBe(false);
+    });
   });
 
   describe('size', function() {