Title: [167544] trunk/Source/_javascript_Core
- Revision
- 167544
- Author
- [email protected]
- Date
- 2014-04-19 13:36:58 -0700 (Sat, 19 Apr 2014)
Log Message
Address some feedback on https://bugs.webkit.org/show_bug.cgi?id=130684.
* dfg/DFGOperations.cpp:
* runtime/JSString.h:
(JSC::JSRopeString::RopeBuilder::append):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (167543 => 167544)
--- trunk/Source/_javascript_Core/ChangeLog 2014-04-19 20:10:49 UTC (rev 167543)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-04-19 20:36:58 UTC (rev 167544)
@@ -1,3 +1,11 @@
+2014-04-19 Filip Pizlo <[email protected]>
+
+ Address some feedback on https://bugs.webkit.org/show_bug.cgi?id=130684.
+
+ * dfg/DFGOperations.cpp:
+ * runtime/JSString.h:
+ (JSC::JSRopeString::RopeBuilder::append):
+
2014-04-18 Mark Lam <[email protected]>
REGRESSION(r164205): WebKit crash @StructureIDTable::get.
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.cpp (167543 => 167544)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2014-04-19 20:10:49 UTC (rev 167543)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2014-04-19 20:36:58 UTC (rev 167544)
@@ -971,7 +971,7 @@
if (static_cast<int32_t>(left->length() + right->length()) < 0) {
throwOutOfMemoryError(exec);
- return 0;
+ return nullptr;
}
return JSRopeString::create(vm, left, right);
@@ -987,7 +987,7 @@
length += c->length();
if (length.hasOverflowed()) {
throwOutOfMemoryError(exec);
- return 0;
+ return nullptr;
}
return JSRopeString::create(vm, a, b, c);
Modified: trunk/Source/_javascript_Core/runtime/JSString.h (167543 => 167544)
--- trunk/Source/_javascript_Core/runtime/JSString.h 2014-04-19 20:10:49 UTC (rev 167543)
+++ trunk/Source/_javascript_Core/runtime/JSString.h 2014-04-19 20:36:58 UTC (rev 167544)
@@ -234,7 +234,7 @@
if (m_index == JSRopeString::s_maxInternalRopeLength)
expand();
if (static_cast<int32_t>(m_jsString->length() + jsString->length()) < 0) {
- m_jsString = 0;
+ m_jsString = nullptr;
return false;
}
m_jsString->append(m_vm, m_index++, jsString);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
