<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206151] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206151">206151</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2016-09-20 10:14:00 -0700 (Tue, 20 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Undefined behavior: Left shift negative number
https://bugs.webkit.org/show_bug.cgi?id=161866
Reviewed by Keith Miller.
Left shifting a negative number is undefined behavior in C/C++, although most implementations do define it. Explicitly clarifying the intended behavior due to shifting negative number in some cases.
Source/JavaScriptCore:
* dfg/DFGAbstractHeap.h:
(JSC::DFG::AbstractHeap::encode): Explicitly cast signed integer for left shift.
Source/WTF:
* wtf/text/Base64.cpp:
(WTF::base64EncodeInternal): Changed signed character to unsigned when shifting.
(WTF::base64Encode): Ditto.
(WTF::base64URLEncode): Ditto.
(WTF::base64DecodeInternal): Ditto.
* wtf/text/Base64.h: Ditto.
(WTF::SignedOrUnsignedCharVectorAdapter): Rebuilt to stop using union as a bitwise_cast.
(WTF::ConstSignedOrUnsignedCharVectorAdapter): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractHeaph">trunk/Source/JavaScriptCore/dfg/DFGAbstractHeap.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextBase64cpp">trunk/Source/WTF/wtf/text/Base64.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextBase64h">trunk/Source/WTF/wtf/text/Base64.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206150 => 206151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-20 15:58:37 UTC (rev 206150)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-20 17:14:00 UTC (rev 206151)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-20 Jonathan Bedard <jbedard@apple.com>
+
+ Undefined behavior: Left shift negative number
+ https://bugs.webkit.org/show_bug.cgi?id=161866
+
+ Reviewed by Keith Miller.
+
+ Left shifting a negative number is undefined behavior in C/C++, although most implementations do define it. Explicitly clarifying the intended behavior due to shifting negative number in some cases.
+
+ * dfg/DFGAbstractHeap.h:
+ (JSC::DFG::AbstractHeap::encode): Explicitly cast signed integer for left shift.
+
</ins><span class="cx"> 2016-09-20 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed fix for 32-bit DFG x86 implementation of HasOwnProperty.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractHeap.h (206150 => 206151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractHeap.h 2016-09-20 15:58:37 UTC (rev 206150)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractHeap.h 2016-09-20 17:14:00 UTC (rev 206151)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> {
</span><span class="cx"> int64_t kindAsInt = static_cast<int64_t>(kind);
</span><span class="cx"> ASSERT(kindAsInt < (1 << topShift));
</span><del>- return kindAsInt | (payload.isTop() << topShift) | (payload.valueImpl() << valueShift);
</del><ins>+ return kindAsInt | (static_cast<uint64_t>(payload.isTop()) << topShift) | (bitwise_cast<uint64_t>(payload.valueImpl()) << valueShift);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The layout of the value is:
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (206150 => 206151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-20 15:58:37 UTC (rev 206150)
+++ trunk/Source/WTF/ChangeLog 2016-09-20 17:14:00 UTC (rev 206151)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-20 Jonathan Bedard <jbedard@apple.com>
+
+ Undefined behavior: Left shift negative number
+ https://bugs.webkit.org/show_bug.cgi?id=161866
+
+ Reviewed by Keith Miller.
+
+ Left shifting a negative number is undefined behavior in C/C++, although most implementations do define it. Explicitly clarifying the intended behavior due to shifting negative number in some cases.
+
+ * wtf/text/Base64.cpp:
+ (WTF::base64EncodeInternal): Changed signed character to unsigned when shifting.
+ (WTF::base64Encode): Ditto.
+ (WTF::base64URLEncode): Ditto.
+ (WTF::base64DecodeInternal): Ditto.
+ * wtf/text/Base64.h: Ditto.
+ (WTF::SignedOrUnsignedCharVectorAdapter): Rebuilt to stop using union as a bitwise_cast.
+ (WTF::ConstSignedOrUnsignedCharVectorAdapter): Ditto.
+
</ins><span class="cx"> 2016-09-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(TEXT_AUTOSIZING) automatic text size adjustment code
</span></span></pre></div>
<a id="trunkSourceWTFwtftextBase64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/Base64.cpp (206150 => 206151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/Base64.cpp 2016-09-20 15:58:37 UTC (rev 206150)
+++ trunk/Source/WTF/wtf/text/Base64.cpp 2016-09-20 17:14:00 UTC (rev 206151)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> 0x31, 0x32, 0x33, nonAlphabet, nonAlphabet, nonAlphabet, nonAlphabet, nonAlphabet
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static inline void base64EncodeInternal(const char* data, unsigned len, Vector<char>& out, Base64EncodePolicy policy, const char (&encodeMap)[64])
</del><ins>+static inline void base64EncodeInternal(const unsigned char* data, unsigned len, Vector<char>& out, Base64EncodePolicy policy, const char (&encodeMap)[64])
</ins><span class="cx"> {
</span><span class="cx"> out.clear();
</span><span class="cx"> if (!len)
</span><span class="lines">@@ -160,29 +160,29 @@
</span><span class="cx"> String base64Encode(const void* data, unsigned length, Base64EncodePolicy policy)
</span><span class="cx"> {
</span><span class="cx"> Vector<char> result;
</span><del>- base64EncodeInternal(static_cast<const char*>(data), length, result, policy, base64EncMap);
</del><ins>+ base64EncodeInternal(static_cast<const unsigned char*>(data), length, result, policy, base64EncMap);
</ins><span class="cx"> return String(result.data(), result.size());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void base64Encode(const void* data, unsigned len, Vector<char>& out, Base64EncodePolicy policy)
</span><span class="cx"> {
</span><del>- base64EncodeInternal(static_cast<const char*>(data), len, out, policy, base64EncMap);
</del><ins>+ base64EncodeInternal(static_cast<const unsigned char*>(data), len, out, policy, base64EncMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String base64URLEncode(const void* data, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> Vector<char> result;
</span><del>- base64EncodeInternal(static_cast<const char*>(data), length, result, Base64URLPolicy, base64URLEncMap);
</del><ins>+ base64EncodeInternal(static_cast<const unsigned char*>(data), length, result, Base64URLPolicy, base64URLEncMap);
</ins><span class="cx"> return String(result.data(), result.size());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void base64URLEncode(const void* data, unsigned len, Vector<char>& out)
</span><span class="cx"> {
</span><del>- base64EncodeInternal(static_cast<const char*>(data), len, out, Base64URLPolicy, base64URLEncMap);
</del><ins>+ base64EncodeInternal(static_cast<const unsigned char*>(data), len, out, Base64URLPolicy, base64URLEncMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-static inline bool base64DecodeInternal(const T* data, unsigned length, Vector<char>& out, unsigned options, const char (&decodeMap)[128])
</del><ins>+static inline bool base64DecodeInternal(const T* data, unsigned length, SignedOrUnsignedCharVectorAdapter& out, unsigned options, const char (&decodeMap)[128])
</ins><span class="cx"> {
</span><span class="cx"> out.clear();
</span><span class="cx"> if (!length)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextBase64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/Base64.h (206150 => 206151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/Base64.h 2016-09-20 15:58:37 UTC (rev 206150)
+++ trunk/Source/WTF/wtf/text/Base64.h 2016-09-20 17:14:00 UTC (rev 206151)
</span><span class="lines">@@ -48,13 +48,62 @@
</span><span class="cx">
</span><span class="cx"> class SignedOrUnsignedCharVectorAdapter {
</span><span class="cx"> public:
</span><del>- SignedOrUnsignedCharVectorAdapter(Vector<char>& vector) { m_vector.c = &vector; }
- SignedOrUnsignedCharVectorAdapter(Vector<uint8_t>& vector) { m_vector.u = &vector; }
</del><ins>+ SignedOrUnsignedCharVectorAdapter(Vector<char>& vector)
+ : m_isSigned(true)
+ {
+ m_vector.c = &vector;
+ }
+ SignedOrUnsignedCharVectorAdapter(Vector<uint8_t>& vector)
+ : m_isSigned(false)
+ {
+ m_vector.u = &vector;
+ }
</ins><span class="cx">
</span><del>- operator Vector<char>&() { return *m_vector.c; }
- void clear() { m_vector.c->clear(); }
</del><ins>+ uint8_t* data()
+ {
+ if (m_isSigned)
+ return reinterpret_cast<uint8_t*>(m_vector.c->data());
+ return m_vector.u->data();
+ }
+
+ size_t size() const
+ {
+ if (m_isSigned)
+ return m_vector.c->size();
+ return m_vector.u->size();
+ }
+
+ void clear()
+ {
+ if (m_isSigned) {
+ m_vector.c->clear();
+ return;
+ }
+ m_vector.u->clear();
+ }
+
+ void grow(size_t size)
+ {
+ if (m_isSigned) {
+ m_vector.c->grow(size);
+ return;
+ }
+ m_vector.u->grow(size);
+ }
+
+ void shrink(size_t size)
+ {
+ if (m_isSigned) {
+ m_vector.c->shrink(size);
+ return;
+ }
+ m_vector.u->shrink(size);
+ }
+
+ uint8_t& operator[](size_t position) { return data()[position]; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool m_isSigned;
</ins><span class="cx"> union {
</span><span class="cx"> Vector<char>* c;
</span><span class="cx"> Vector<uint8_t>* u;
</span><span class="lines">@@ -63,14 +112,32 @@
</span><span class="cx">
</span><span class="cx"> class ConstSignedOrUnsignedCharVectorAdapter {
</span><span class="cx"> public:
</span><del>- ConstSignedOrUnsignedCharVectorAdapter(const Vector<char>& vector) { m_vector.c = &vector; }
- ConstSignedOrUnsignedCharVectorAdapter(const Vector<uint8_t>& vector) { m_vector.u = &vector; }
</del><ins>+ ConstSignedOrUnsignedCharVectorAdapter(const Vector<char>& vector)
+ : m_isSigned(false)
+ {
+ m_vector.c = &vector;
+ }
+ ConstSignedOrUnsignedCharVectorAdapter(const Vector<uint8_t>& vector)
+ : m_isSigned(true)
+ {
+ m_vector.u = &vector;
+ }
</ins><span class="cx">
</span><del>- operator const Vector<char>&() { return *m_vector.c; }
- const char* data() const { return m_vector.c->data(); }
- size_t size() const { return m_vector.c->size(); }
</del><ins>+ const uint8_t* data() const
+ {
+ if (m_isSigned)
+ return reinterpret_cast<const uint8_t*>(m_vector.c->data());
+ return m_vector.u->data();
+ }
+ size_t size() const
+ {
+ if (m_isSigned)
+ return m_vector.c->size();
+ return m_vector.u->size();
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool m_isSigned;
</ins><span class="cx"> union {
</span><span class="cx"> const Vector<char>* c;
</span><span class="cx"> const Vector<uint8_t>* u;
</span></span></pre>
</div>
</div>
</body>
</html>