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

Side by Side Diff: src/v8conversions.h

Issue 74583003: Fix data view accessors to throw execptions on offsets bigger than size_t. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Fix after a bad merge Created 7 years, 1 month 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 | « src/runtime.cc ('k') | test/mjsunit/harmony/dataview-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 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 // Converts a string into a double value according to ECMA-262 9.3.1 49 // Converts a string into a double value according to ECMA-262 9.3.1
50 double StringToDouble(UnicodeCache* unicode_cache, 50 double StringToDouble(UnicodeCache* unicode_cache,
51 String* str, 51 String* str,
52 int flags, 52 int flags,
53 double empty_string_val = 0); 53 double empty_string_val = 0);
54 54
55 // Converts a string into an integer. 55 // Converts a string into an integer.
56 double StringToInt(UnicodeCache* unicode_cache, String* str, int radix); 56 double StringToInt(UnicodeCache* unicode_cache, String* str, int radix);
57 57
58 inline bool TryNumberToSize(Isolate* isolate,
59 Object* number, size_t* result) {
60 SealHandleScope shs(isolate);
61 if (number->IsSmi()) {
62 int value = Smi::cast(number)->value();
63 ASSERT(
64 static_cast<unsigned>(Smi::kMaxValue)
65 <= std::numeric_limits<size_t>::max());
66 if (value >= 0) {
67 *result = static_cast<size_t>(value);
68 return true;
69 }
70 return false;
71 } else {
72 ASSERT(number->IsHeapNumber());
73 double value = HeapNumber::cast(number)->value();
74 if (value >= 0 &&
75 value <= std::numeric_limits<size_t>::max()) {
76 *result = static_cast<size_t>(value);
77 return true;
78 } else {
79 return false;
80 }
81 }
82 }
83
58 // Converts a number into size_t. 84 // Converts a number into size_t.
59 inline size_t NumberToSize(Isolate* isolate, 85 inline size_t NumberToSize(Isolate* isolate,
60 Object* number) { 86 Object* number) {
61 SealHandleScope shs(isolate); 87 size_t result;
62 if (number->IsSmi()) { 88 bool is_valid = TryNumberToSize(isolate, number, &result);
63 int value = Smi::cast(number)->value(); 89 CHECK(is_valid);
64 CHECK_GE(value, 0); 90 return result;
65 ASSERT(
66 static_cast<unsigned>(Smi::kMaxValue)
67 <= std::numeric_limits<size_t>::max());
68 return static_cast<size_t>(value);
69 } else {
70 ASSERT(number->IsHeapNumber());
71 double value = HeapNumber::cast(number)->value();
72 CHECK(value >= 0 &&
73 value <= std::numeric_limits<size_t>::max());
74 return static_cast<size_t>(value);
75 }
76 } 91 }
77 92
78 } } // namespace v8::internal 93 } } // namespace v8::internal
79 94
80 #endif // V8_V8CONVERSIONS_H_ 95 #endif // V8_V8CONVERSIONS_H_
OLDNEW
« no previous file with comments | « src/runtime.cc ('k') | test/mjsunit/harmony/dataview-accessors.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698