Revision: 20403
Author: [email protected]
Date: Tue Apr 1 13:09:13 2014 UTC
Log: Merged r20323 into 3.25 branch.
Don't crash if we get a timezone change notification on an uninitialized
isolate
BUG=357362
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/212123012
http://code.google.com/p/v8/source/detail?r=20403
Modified:
/branches/3.25/src/api.cc
/branches/3.25/src/date.cc
/branches/3.25/src/version.cc
=======================================
--- /branches/3.25/src/api.cc Thu Mar 27 01:04:43 2014 UTC
+++ /branches/3.25/src/api.cc Tue Apr 1 13:09:13 2014 UTC
@@ -5710,6 +5710,7 @@
void v8::Date::DateTimeConfigurationChangeNotification(Isolate* isolate) {
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+ if (!i_isolate->IsInitialized()) return;
ON_BAILOUT(i_isolate, "v8::Date::DateTimeConfigurationChangeNotification()",
return);
LOG_API(i_isolate, "Date::DateTimeConfigurationChangeNotification");
=======================================
--- /branches/3.25/src/date.cc Fri Mar 14 16:14:53 2014 UTC
+++ /branches/3.25/src/date.cc Tue Apr 1 13:09:13 2014 UTC
@@ -49,9 +49,10 @@
void DateCache::ResetDateCache() {
static const int kMaxStamp = Smi::kMaxValue;
- stamp_ = Smi::FromInt(stamp_->value() + 1);
- if (stamp_->value() > kMaxStamp) {
+ if (stamp_->value() >= kMaxStamp) {
stamp_ = Smi::FromInt(0);
+ } else {
+ stamp_ = Smi::FromInt(stamp_->value() + 1);
}
ASSERT(stamp_ != Smi::FromInt(kInvalidStamp));
for (int i = 0; i < kDSTSize; ++i) {
=======================================
--- /branches/3.25/src/version.cc Thu Mar 27 01:04:43 2014 UTC
+++ /branches/3.25/src/version.cc Tue Apr 1 13:09:13 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 25
#define BUILD_NUMBER 28
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
