[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [281735] trunk/Source/WTF
From: ddkilzer () apple ! com
Date: 2021-08-28 16:48:17
Message-ID: 20210828164817.25F591005107 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[281735] trunk/Source/WTF</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/281735">281735</a></dd> \
<dt>Author</dt> <dd>ddkilzer@apple.com</dd> <dt>Date</dt> <dd>2021-08-28 09:48:16 \
-0700 (Sat, 28 Aug 2021)</dd> </dl>
<h3>Log Message</h3>
<pre>[WTF] Fix static analyzer warnings about nullptr derefs in \
StringImpl::copyCharacters() and tryMakeStringFromAdapters() \
<https://webkit.org/b/229461> <rdar://problem/82303279>
Reviewed by Darin Adler.
* wtf/text/StringConcatenate.h:
(WTF::tryMakeStringFromAdapters):
- Add nullptr checks for `buffer` since it makes no sense to
call stringTypeAdapterAccumulator() with a nullptr argument,
and it fixes static analyzer warnings about dereferencing
nullptr.
* wtf/text/StringImpl.h:
(WTF::StringImpl::copyCharacters):
- Add `ASSERT(destination || !numCharacters)` statement to
describe an invariant when calling this method. This stops
the static analyzer from emitting false positive warnings
about `destination` being nullptr.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringConcatenateh">trunk/Source/WTF/wtf/text/StringConcatenate.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (281734 => 281735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2021-08-28 13:15:49 UTC (rev \
281734)
+++ trunk/Source/WTF/ChangeLog 2021-08-28 16:48:16 UTC (rev 281735)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-08-28 David Kilzer <ddkilzer@apple.com>
+
+ [WTF] Fix static analyzer warnings about nullptr derefs in \
StringImpl::copyCharacters() and tryMakeStringFromAdapters() + \
<https://webkit.org/b/229461> + <rdar://problem/82303279>
+
+ Reviewed by Darin Adler.
+
+ * wtf/text/StringConcatenate.h:
+ (WTF::tryMakeStringFromAdapters):
+ - Add nullptr checks for `buffer` since it makes no sense to
+ call stringTypeAdapterAccumulator() with a nullptr argument,
+ and it fixes static analyzer warnings about dereferencing
+ nullptr.
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::copyCharacters):
+ - Add `ASSERT(destination || !numCharacters)` statement to
+ describe an invariant when calling this method. This stops
+ the static analyzer from emitting false positive warnings
+ about `destination` being nullptr.
+
</ins><span class="cx"> 2021-08-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Define ENABLE_CONTENT_CHANGE_OBSERVER for IOS_FAMILY \
and use it to wrap content observation code </span></span></pre></div>
<a id="trunkSourceWTFwtftextStringConcatenateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringConcatenate.h \
(281734 => 281735)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringConcatenate.h 2021-08-28 \
13:15:49 UTC (rev 281734)
+++ trunk/Source/WTF/wtf/text/StringConcatenate.h 2021-08-28 16:48:16 UTC (rev \
281735) </span><span class="lines">@@ -442,7 +442,8 @@
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</del><ins>+ if (buffer)
+ stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</ins><span class="cx">
</span><span class="cx"> return resultImpl;
</span><span class="cx"> }
</span><span class="lines">@@ -452,7 +453,8 @@
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</del><ins>+ if (buffer)
+ stringTypeAdapterAccumulator(buffer, adapter, adapters...);
</ins><span class="cx">
</span><span class="cx"> return resultImpl;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (281734 => \
281735)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2021-08-28 13:15:49 UTC \
(rev 281734)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2021-08-28 16:48:16 UTC (rev 281735)
</span><span class="lines">@@ -1125,6 +1125,7 @@
</span><span class="cx"> template<typename SourceCharacterType, typename \
DestinationCharacterType> </span><span class="cx"> inline void \
StringImpl::copyCharacters(DestinationCharacterType* destination, const \
SourceCharacterType* source, unsigned numCharacters) </span><span class="cx"> {
</span><ins>+ ASSERT(destination || !numCharacters); // Workaround for clang \
static analyzer (<rdar://problem/82475719>). </ins><span class="cx"> \
static_assert(std::is_same_v<SourceCharacterType, LChar> || \
std::is_same_v<SourceCharacterType, UChar>); </span><span class="cx"> \
static_assert(std::is_same_v<DestinationCharacterType, LChar> || \
std::is_same_v<DestinationCharacterType, UChar>); </span><span class="cx"> \
if constexpr (std::is_same_v<SourceCharacterType, DestinationCharacterType>) { \
</span></span></pre> </div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic