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

Side by Side Diff: src/objects.cc

Issue 63010: Fix crash with indexed setter on objects without corresponding getter. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 11 years, 8 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 | test/mjsunit/indexed-accessors.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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
11 // with the distribution. 11 // with the distribution.
(...skipping 5502 matching lines...) Expand 10 before | Expand all | Expand 10 after
5514 if (entry != -1) { 5514 if (entry != -1) {
5515 Object* element = dictionary->ValueAt(entry); 5515 Object* element = dictionary->ValueAt(entry);
5516 PropertyDetails details = dictionary->DetailsAt(entry); 5516 PropertyDetails details = dictionary->DetailsAt(entry);
5517 if (details.type() == CALLBACKS) { 5517 if (details.type() == CALLBACKS) {
5518 // Only accessors allowed as elements. 5518 // Only accessors allowed as elements.
5519 FixedArray* structure = FixedArray::cast(element); 5519 FixedArray* structure = FixedArray::cast(element);
5520 Object* getter = structure->get(kGetterIndex); 5520 Object* getter = structure->get(kGetterIndex);
5521 if (getter->IsJSFunction()) { 5521 if (getter->IsJSFunction()) {
5522 return GetPropertyWithDefinedGetter(receiver, 5522 return GetPropertyWithDefinedGetter(receiver,
5523 JSFunction::cast(getter)); 5523 JSFunction::cast(getter));
5524 } else {
5525 // Getter is not a function.
5526 return Heap::undefined_value();
5524 } 5527 }
5525 } 5528 }
5526 return element; 5529 return element;
5527 } 5530 }
5528 } 5531 }
5529 5532
5530 Object* pt = GetPrototype(); 5533 Object* pt = GetPrototype();
5531 if (pt == Heap::null_value()) return Heap::undefined_value(); 5534 if (pt == Heap::null_value()) return Heap::undefined_value();
5532 return pt->GetElementWithReceiver(receiver, index); 5535 return pt->GetElementWithReceiver(receiver, index);
5533 } 5536 }
(...skipping 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after
7377 // No break point. 7380 // No break point.
7378 if (break_point_objects()->IsUndefined()) return 0; 7381 if (break_point_objects()->IsUndefined()) return 0;
7379 // Single beak point. 7382 // Single beak point.
7380 if (!break_point_objects()->IsFixedArray()) return 1; 7383 if (!break_point_objects()->IsFixedArray()) return 1;
7381 // Multiple break points. 7384 // Multiple break points.
7382 return FixedArray::cast(break_point_objects())->length(); 7385 return FixedArray::cast(break_point_objects())->length();
7383 } 7386 }
7384 7387
7385 7388
7386 } } // namespace v8::internal 7389 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/indexed-accessors.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698