Add check against NullPointerException

hns · hns · commit cdab86089c2c · 2012-06-06T15:52:48.000+02:00
diff --git a/src/org/mozilla/javascript/ScriptableObject.java b/src/org/mozilla/javascript/ScriptableObject.java
@@ -1259,7 +1259,7 @@ static <T extends Scriptable> BaseFunction buildClassCtor(
         Object existing = getProperty(getTopLevelScope(scope), className);
         if (existing instanceof BaseFunction) {
             Object existingProto = ((BaseFunction)existing).getPrototypeProperty();
-            if (clazz.equals(existingProto.getClass())) {
+            if (existingProto != null && clazz.equals(existingProto.getClass())) {
                 return (BaseFunction)existing;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,7 @@ static <T extends Scriptable> BaseFunction buildClassCtor(`
`1259`	`1259`	`Object existing = getProperty(getTopLevelScope(scope), className);`
`1260`	`1260`	`if (existing instanceof BaseFunction) {`
`1261`	`1261`	`Object existingProto = ((BaseFunction)existing).getPrototypeProperty();`
`1262`		`- if (clazz.equals(existingProto.getClass())) {`
	`1262`	`+ if (existingProto != null && clazz.equals(existingProto.getClass())) {`
`1263`	`1263`	`return (BaseFunction)existing;`
`1264`	`1264`	`}`
`1265`	`1265`	`}`