Changeset 15698 in webkit for trunk/JavaScriptCore/bindings/NP_jsobject.cpp
- Timestamp:
- Jul 29, 2006, 5:04:22 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/bindings/NP_jsobject.cpp
- Property allow-tabs deleted
r14834 r15698 73 73 { 74 74 if (obj->originExecutionContext) { 75 76 77 75 Interpreter* originInterpreter = obj->originExecutionContext->interpreter(); 76 if (originInterpreter) 77 return originInterpreter->isSafeScript(obj->executionContext->interpreter()); 78 78 } 79 79 return true; … … 113 113 if (o->_class == NPScriptObjectClass) { 114 114 JavaScriptObject* obj = (JavaScriptObject*)o; 115 116 115 if (!_isSafeScript(obj)) 116 return false; 117 117 118 118 PrivateIdentifier* i = (PrivateIdentifier*)methodName; … … 120 120 return false; 121 121 122 123 124 125 126 127 128 129 122 // Special case the "eval" method. 123 if (methodName == _NPN_GetStringIdentifier("eval")) { 124 if (argCount != 1) 125 return false; 126 if (args[0].type != NPVariantType_String) 127 return false; 128 return _NPN_Evaluate(npp, o, (NPString *)&args[0].value.stringValue, result); 129 } 130 130 131 131 // Lookup the function object. … … 164 164 JavaScriptObject* obj = (JavaScriptObject*)o; 165 165 166 167 166 if (!_isSafeScript(obj)) 167 return false; 168 168 169 169 ExecState* exec = obj->executionContext->interpreter()->globalExec(); … … 199 199 if (o->_class == NPScriptObjectClass) { 200 200 JavaScriptObject* obj = (JavaScriptObject*)o; 201 202 201 if (!_isSafeScript(obj)) 202 return false; 203 203 204 204 ExecState* exec = obj->executionContext->interpreter()->globalExec(); … … 238 238 if (o->_class == NPScriptObjectClass) { 239 239 JavaScriptObject* obj = (JavaScriptObject*)o; 240 241 240 if (!_isSafeScript(obj)) 241 return false; 242 242 243 243 ExecState* exec = obj->executionContext->interpreter()->globalExec(); … … 261 261 if (o->_class == NPScriptObjectClass) { 262 262 JavaScriptObject* obj = (JavaScriptObject*)o; 263 264 263 if (!_isSafeScript(obj)) 264 return false; 265 265 266 266 ExecState* exec = obj->executionContext->interpreter()->globalExec(); … … 289 289 if (o->_class == NPScriptObjectClass) { 290 290 JavaScriptObject* obj = (JavaScriptObject*)o; 291 292 291 if (!_isSafeScript(obj)) 292 return false; 293 293 294 294 ExecState* exec = obj->executionContext->interpreter()->globalExec(); … … 310 310 if (o->_class == NPScriptObjectClass) { 311 311 JavaScriptObject* obj = (JavaScriptObject*)o; 312 313 312 if (!_isSafeScript(obj)) 313 return false; 314 314 315 315 PrivateIdentifier* i = (PrivateIdentifier*)methodName;
Note:
See TracChangeset
for help on using the changeset viewer.