Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: src/objects.cc

Issue 7660012: Fix potentially GC unsafe place in JSObject::DeleteElementWithInterceptor. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 3149 matching lines...) Expand 10 before | Expand all | Expand 10 after
3160 { 3160 {
3161 // Leaving JavaScript. 3161 // Leaving JavaScript.
3162 VMState state(isolate, EXTERNAL); 3162 VMState state(isolate, EXTERNAL);
3163 result = deleter(index, info); 3163 result = deleter(index, info);
3164 } 3164 }
3165 RETURN_IF_SCHEDULED_EXCEPTION(isolate); 3165 RETURN_IF_SCHEDULED_EXCEPTION(isolate);
3166 if (!result.IsEmpty()) { 3166 if (!result.IsEmpty()) {
3167 ASSERT(result->IsBoolean()); 3167 ASSERT(result->IsBoolean());
3168 return *v8::Utils::OpenHandle(*result); 3168 return *v8::Utils::OpenHandle(*result);
3169 } 3169 }
3170 MaybeObject* raw_result = GetElementsAccessor()->Delete(*this_handle, 3170 MaybeObject* raw_result = this_handle->GetElementsAccessor()->Delete(
3171 index, 3171 *this_handle,
3172 NORMAL_DELETION); 3172 index,
3173 NORMAL_DELETION);
3173 RETURN_IF_SCHEDULED_EXCEPTION(isolate); 3174 RETURN_IF_SCHEDULED_EXCEPTION(isolate);
3174 return raw_result; 3175 return raw_result;
3175 } 3176 }
3176 3177
3177 3178
3178 MaybeObject* JSObject::DeleteElement(uint32_t index, DeleteMode mode) { 3179 MaybeObject* JSObject::DeleteElement(uint32_t index, DeleteMode mode) {
3179 Isolate* isolate = GetIsolate(); 3180 Isolate* isolate = GetIsolate();
3180 // Check access rights if needed. 3181 // Check access rights if needed.
3181 if (IsAccessCheckNeeded() && 3182 if (IsAccessCheckNeeded() &&
3182 !isolate->MayIndexedAccess(this, index, v8::ACCESS_DELETE)) { 3183 !isolate->MayIndexedAccess(this, index, v8::ACCESS_DELETE)) {
(...skipping 8416 matching lines...) Expand 10 before | Expand all | Expand 10 after
11599 if (break_point_objects()->IsUndefined()) return 0; 11600 if (break_point_objects()->IsUndefined()) return 0;
11600 // Single break point. 11601 // Single break point.
11601 if (!break_point_objects()->IsFixedArray()) return 1; 11602 if (!break_point_objects()->IsFixedArray()) return 1;
11602 // Multiple break points. 11603 // Multiple break points.
11603 return FixedArray::cast(break_point_objects())->length(); 11604 return FixedArray::cast(break_point_objects())->length();
11604 } 11605 }
11605 #endif 11606 #endif
11606 11607
11607 11608
11608 } } // namespace v8::internal 11609 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698