Wrap obj.constructor test in try/catch. Thanks to bkrausz. Fixes #9897

jquery · Jul 25, 2011 · ad16db3 · ad16db3
1 parent 27291ff
commit ad16db3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/core.js b/src/core.js
@@ -500,10 +500,15 @@ jQuery.extend({
 			return false;
 		}
 
-		// Not own constructor property must be Object
-		if ( obj.constructor &&
-			!hasOwn.call(obj, "constructor") &&
-			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
 			return false;
 		}
 

diff --git a/test/unit/core.js b/test/unit/core.js
@@ -290,7 +290,7 @@ test("type", function() {
 });
 
 test("isPlainObject", function() {
-	expect(14);
+	expect(15);
 
 	stop();
 
@@ -331,6 +331,13 @@ test("isPlainObject", function() {
 	// Window
 	ok(!jQuery.isPlainObject(window), "window");
 
+	try {
+		jQuery.isPlainObject( window.location );
+		ok( true, "Does not throw exceptions on host objects");
+	} catch ( e ) {
+		ok( false, "Does not throw exceptions on host objects -- FAIL");
+	}
+
 	try {
 		var iframe = document.createElement("iframe");
 		document.body.appendChild(iframe);