<!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>[164580] trunk/Source/ThirdParty/ANGLE</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/164580">164580</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 03:14:29 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ANGLE: Stop using unsafe strcpy method
<http://webkit.org/b/129237>
<rdar://problem/11077580>
Reviewed by Dean Jackson.
* include/GLSLANG/ShaderLang.h:
- Drive-by fix for header documentation.
* src/compiler/translator/ShaderLang.cpp:
(ShGetInfoLog):
(ShGetObjectCode):
* src/libGLESv2/Program.cpp:
(gl::InfoLog::append):
- Switch to use strncpy(), and explicitly set NULL terminator at
the end of the buffer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEincludeGLSLANGShaderLangh">trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilertranslatorShaderLangcpp">trunk/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrclibGLESv2Programcpp">trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (164579 => 164580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-02-24 10:02:10 UTC (rev 164579)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-02-24 11:14:29 UTC (rev 164580)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-23 David Kilzer <ddkilzer@apple.com>
+
+ ANGLE: Stop using unsafe strcpy method
+ <http://webkit.org/b/129237>
+ <rdar://problem/11077580>
+
+ Reviewed by Dean Jackson.
+
+ * include/GLSLANG/ShaderLang.h:
+ - Drive-by fix for header documentation.
+
+ * src/compiler/translator/ShaderLang.cpp:
+ (ShGetInfoLog):
+ (ShGetObjectCode):
+ * src/libGLESv2/Program.cpp:
+ (gl::InfoLog::append):
+ - Switch to use strncpy(), and explicitly set NULL terminator at
+ the end of the buffer.
+
</ins><span class="cx"> 2014-02-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Unreviewed build fix after r164565.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEincludeGLSLANGShaderLangh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h (164579 => 164580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h 2014-02-24 10:02:10 UTC (rev 164579)
+++ trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h 2014-02-24 11:14:29 UTC (rev 164580)
</span><span class="lines">@@ -383,8 +383,8 @@
</span><span class="cx"> // Returns null-terminated object code for a compiled shader.
</span><span class="cx"> // Parameters:
</span><span class="cx"> // handle: Specifies the compiler
</span><del>-// infoLog: Specifies an array of characters that is used to return
-// the object code. It is assumed that infoLog has enough memory to
</del><ins>+// objCode: Specifies an array of characters that is used to return
+// the object code. It is assumed that objCode has enough memory to
</ins><span class="cx"> // accomodate the object code. The size of the buffer required to
</span><span class="cx"> // store the returned object code can be obtained by calling
</span><span class="cx"> // ShGetInfo with SH_OBJECT_CODE_LENGTH.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilertranslatorShaderLangcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp (164579 => 164580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp 2014-02-24 10:02:10 UTC (rev 164579)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp 2014-02-24 11:14:29 UTC (rev 164580)
</span><span class="lines">@@ -225,8 +225,12 @@
</span><span class="cx"> TCompiler* compiler = base->getAsCompiler();
</span><span class="cx"> if (!compiler) return;
</span><span class="cx">
</span><ins>+ size_t infoLogLength = 0;
+ ShGetInfo(compiler, SH_INFO_LOG_LENGTH, &infoLogLength);
+
</ins><span class="cx"> TInfoSink& infoSink = compiler->getInfoSink();
</span><del>- strcpy(infoLog, infoSink.info.c_str());
</del><ins>+ strncpy(infoLog, infoSink.info.c_str(), infoLogLength);
+ infoLog[infoLogLength - 1] = '\0';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //
</span><span class="lines">@@ -241,8 +245,12 @@
</span><span class="cx"> TCompiler* compiler = base->getAsCompiler();
</span><span class="cx"> if (!compiler) return;
</span><span class="cx">
</span><ins>+ size_t objCodeLength = 0;
+ ShGetInfo(handle, SH_OBJECT_CODE_LENGTH, &objCodeLength);
+
</ins><span class="cx"> TInfoSink& infoSink = compiler->getInfoSink();
</span><del>- strcpy(objCode, infoSink.obj.c_str());
</del><ins>+ strncpy(objCode, infoSink.obj.c_str(), objCodeLength);
+ objCode[objCodeLength - 1] = '\0';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShGetVariableInfo(const ShHandle handle,
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrclibGLESv2Programcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp (164579 => 164580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp 2014-02-24 10:02:10 UTC (rev 164579)
+++ trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp 2014-02-24 11:14:29 UTC (rev 164580)
</span><span class="lines">@@ -106,17 +106,21 @@
</span><span class="cx">
</span><span class="cx"> if (!mInfoLog)
</span><span class="cx"> {
</span><del>- mInfoLog = new char[infoLength + 2];
- strcpy(mInfoLog, info);
- strcpy(mInfoLog + infoLength, "\n");
</del><ins>+ const size_t newInfoLogLength = infoLength + 2;
+ mInfoLog = new char[newInfoLogLength];
+ strncpy(mInfoLog, info, newInfoLogLength);
+ strncpy(mInfoLog + infoLength, "\n", newInfoLogLength - infoLength);
+ mInfoLog[newInfoLogLength - 1] = '\0';
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> size_t logLength = strlen(mInfoLog);
</span><del>- char *newLog = new char[logLength + infoLength + 2];
- strcpy(newLog, mInfoLog);
- strcpy(newLog + logLength, info);
- strcpy(newLog + logLength + infoLength, "\n");
</del><ins>+ const size_t newInfoLogLength = logLength + infoLength + 2;
+ char *newLog = new char[newInfoLogLength];
+ strncpy(newLog, mInfoLog, newInfoLogLength);
+ strncpy(newLog + logLength, info, newInfoLogLength - logLength);
+ strncpy(newLog + logLength + infoLength, "\n", newInfoLogLength - logLength - infoLength);
+ newLog[newInfoLogLength - 1] = '\0';
</ins><span class="cx">
</span><span class="cx"> delete[] mInfoLog;
</span><span class="cx"> mInfoLog = newLog;
</span></span></pre>
</div>
</div>
</body>
</html>