<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D29814">View Revision</a></tr></table><br /><div><div><p>I'm a bit confused by the bug this is fixing. Surely this doesn't happen to all cases of crashes without autorestart enabled??</p>

<p>Also, it sounds like a null check might be enough.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D29814#inline-171178">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcrash.cpp:107</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #aa4000">static</span> <span style="color: #aa4000">char</span> <span style="color: #aa2211">*</span><span class="n">s_appPath</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">nullptr</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #aa4000">static</span> <span style="color: #aa4000">int</span> <span class="n">s_autoRestartArgc</span> <span style="color: #aa2211">=</span> <span style="color: #601200">0</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #aa4000">static</span> <span style="color: #aa4000">char</span> <span style="color: #aa2211">**</span><span class="n">s_autoRestartCommandLine</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">nullptr</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #aa4000">static</span> <span style="color: #aa4000">char</span> <span style="color: #aa2211">**</span><span class="n">s_autoRestartCommandLine</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">n<span class="bright">ew</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">char</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">*</span></span><span class="bright"></span><span class="p"><span class="bright">[</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"></span><span class="p"><span class="bright">]{</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">n</span>ullptr<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">}</span>;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Should this become 1 then? Otherwise the <tt style="background: #ebebeb; font-size: 13px;">for</tt> loop won't delete that new <tt style="background: #ebebeb; font-size: 13px;">new char*[1]</tt></p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D29814#inline-171179">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcrash.cpp:272</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span style="color: #aa4000">if</span> <span class="p">(<span class="bright"></span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">!</span></span><span class="n">args</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span> <span style="color: #74777d">// edge case: tst_QX11Info::startupId does QApplication app(argc, nullptr)...</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">args</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span> <span style="color: #74777d">// edge case: tst_QX11Info::startupId does QApplication app(argc, nullptr)...</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span class="n">args</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span style="color: #601200">0</span><span class="p">,</span> <span class="n">QString</span><span class="p">());</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">insert(0) reads like prepend, but args is empty anyway, why not just use append?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D29814#inline-171176">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcrash.cpp:275</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">    <span class="n">args</span><span class="p">[</span><span style="color: #601200">0</span><span class="p">]</span> <span style="color: #aa2211">=</span> <span class="n">filePath</span><span class="p">;</span> <span style="color: #74777d">// replace argv[0] with full path above</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">for</span> <span class="p">(</span><span style="color: #aa4000">int</span> <span class="n">arg</span> <span style="color: #aa2211">=</span> <span style="color: #601200">0</span><span class="p">;</span> <span class="n">arg</span> <span style="color: #aa2211"><</span> <span class="n">s_autoRestartArgc</span><span class="p">;</span> <span class="n">arg</span><span style="color: #aa2211">++</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #aa4000">delete</span> <span class="p">[]</span> <span class="n">s_autoRestartCommandLine</span><span class="p">[</span><span class="n">arg</span><span class="p">];</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">We use { ... } braces also around single-line statements in KF5.</p>

<p style="padding: 0; margin: 8px;">Can you do the same for the <tt style="background: #ebebeb; font-size: 13px;">if</tt> above too?</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R285 KCrash</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D29814">https://phabricator.kde.org/D29814</a></div></div><br /><div><strong>To: </strong>jpalecek, Frameworks, dfaure<br /><strong>Cc: </strong>kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns<br /></div>