[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: Re: Review Request 129259: Fix the buffersize in certain situations.
From: Andreas Hartmetz <ahartmetz () gmail ! com>
Date: 2016-10-27 12:57:37
Message-ID: 20161027125737.9507.47982 () mimi ! kde ! org
[Download RAW message or body]
--===============5594704496639499894==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129259/#review100334
-----------------------------------------------------------
Ship it!
In any case this is good enough already.
src/ioslaves/file/file.cpp (line 791)
<https://git.reviewboard.kde.org/r/129259/#comment67346>
You can use qMin() here. As is the compiler would complain about the different \
types (off_t and int), which can be fixed by changing the type of initialLimit to \
off_t.
- Andreas Hartmetz
On Oct. 27, 2016, 4:58 a.m., taro yamada wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/129259/
> -----------------------------------------------------------
>
> (Updated Oct. 27, 2016, 4:58 a.m.)
>
>
> Review request for KDE Frameworks.
>
>
> Bugs: 369275
> https://bugs.kde.org/show_bug.cgi?id=369275
>
>
> Repository: kio
>
>
> Description
> -------
>
> Currently, KIO uses lstat to get the buffersize for readlink.
> But in certain situations, it returns inappropriate value.
>
> For example, "/proc/self" or "/sys/bus/cpu/devices/*" returns its size is 0 , and \
> then readlink fails with EINVAL.(so link won't be shown in kde application.) TMSU \
> seems it returns its target's actual filesize insted of the link's filesize itself. \
> This patch changes the buffersize to 1024 bytes if it is 0.
> And later truncate it to actual size.
>
>
> Diffs
> -----
>
> src/ioslaves/file/file.cpp 8b17d31
>
> Diff: https://git.reviewboard.kde.org/r/129259/diff/
>
>
> Testing
> -------
>
>
> Thanks,
>
> taro yamada
>
>
--===============5594704496639499894==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129259/">https://git.reviewboard.kde.org/r/129259/</a>
</td>
</tr>
</table>
<br />
<p>
Ship it!
</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">In \
any case this is good enough already.</p></pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/129259/diff/3/?file=483024#file483024line791" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/ioslaves/file/file.cpp</a> <span style="font-weight: normal;">
(Diff revision 3)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">791</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">const</span> <span class="kt">int</span> <span class="n">n</span> <span \
class="o">=</span> <span class="n">readlink</span><span class="p">(</span><span \
class="n">path</span><span class="p">.</span><span class="n">constData</span><span \
class="p">(),</span> <span class="n">linkTargetBuffer</span><span \
class="p">.</span><span class="n">data</span><span class="p">(),</span> <span \
class="n">buff</span><span class="p">.</span><span class="n">st_size</span><span \
class="p">);</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">791</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="kt">size_t</span> <span \
class="n">bufferSize</span> <span class="o">=</span> <span class="p">(</span><span \
class="n">buff</span><span class="p">.</span><span class="n">st_size</span> <span \
class="o">></span> <span class="n">initialLimit</span><span class="p">)</span> \
<span class="o">?</span> <span class="nl">initialLimit</span> <span \
class="p">:</span> <span class="n">buff</span><span class="p">.</span><span \
class="n">st_size</span> <span class="o">+</span> <span class="mi">1</span> <span \
class="p">;</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">You \
can use qMin() here. As is the compiler would complain about the different types \
(off_t and int), which can be fixed by changing the type of initialLimit to \
off_t.</p></pre> </div>
</div>
<br />
<p>- Andreas Hartmetz</p>
<br />
<p>On October 27th, 2016, 4:58 a.m. UTC, taro yamada wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for KDE Frameworks.</div>
<div>By taro yamada.</div>
<p style="color: grey;"><i>Updated Oct. 27, 2016, 4:58 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://bugs.kde.org/show_bug.cgi?id=369275">369275</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kio
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Currently, KIO uses lstat to get the buffersize for \
readlink. But in certain situations, it returns inappropriate value.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">For example, "/proc/self" or "/sys/bus/cpu/devices/*" \
returns its size is 0 , and then readlink fails with EINVAL.(so link won't be shown \
in kde application.) TMSU seems it returns its target's actual filesize insted of the \
link's filesize itself.</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">This patch changes the buffersize to \
1024 bytes if it is 0. And later truncate it to actual size.</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/ioslaves/file/file.cpp <span style="color: grey">(8b17d31)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/129259/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============5594704496639499894==--
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic