ensure object exists before accessing .get

eligrey · Nov 20, 2013 · 7bad486 · 7bad486
1 parent edcfd7f
commit 7bad486
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/xccessors-legacy.js b/xccessors-legacy.js
@@ -57,15 +57,15 @@
 			defineProp(this, prop, { set: fun });
 		});
 	}
-	
-	if (getProp) {
-		extendMethod(methods[2], function (prop) { // __lookupGetter__
-			return getProp(this, prop).get ||
-				getProp(this.constructor[proto], prop).get; // look in prototype too
-		});
-		extendMethod(methods[3], function (prop) { // __lookupSetter__
-			return getProp(this, prop).set ||
-				getProp(this.constructor[proto], prop).set; // look in prototype too
-		});
-	}
+
+    if (getProp) {
+        extendMethod(methods[2], function (prop) { // __lookupGetter__
+            return ( (getProp(this, prop) && getProp(this, prop).get) ||
+                (getProp(this.constructor[proto], prop) && getProp(this.constructor[proto], prop).get )); // look in prototype too
+        });
+        extendMethod(methods[3], function (prop) { // __lookupSetter__
+            return ( (getProp(this, prop) && getProp(this, prop).set) ||
+                (getProp(this.constructor[proto], prop) && getProp(this.constructor[proto], prop).set )); // look in prototype too
+        });
+    }
 }());