sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/ping: Guard against division by zero when calculating the RTT.

Browse Source 
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2022-04-22 02:47:58 +02:00 committed by Petro Karashchenko
parent 1acca2946e
commit 473611d51d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/ping/ping.c
View File

@ -242,10 +242,17 @@ static void ping_result(FAR const struct ping_result_s *result)
result->extra / USEC_PER_MSEC); result->extra / USEC_PER_MSEC);
if (result->nreplies > 0) if (result->nreplies > 0)
{ {
long avg = priv->tsum / result->nreplies; long avg = 0;
long long tempnum = priv->tsum2 / result->nreplies - long long tempnum = 0;
long tmdev = 0;
if (priv->tsum > 0)
{
avg = priv->tsum / result->nreplies;
tempnum = priv->tsum2 / result->nreplies -
(long long)avg * avg; (long long)avg * avg;
long tmdev = ub16toi(ub32sqrtub16(uitoub32(tempnum))); tmdev = ub16toi(ub32sqrtub16(uitoub32(tempnum)));
}
printf("rtt min/avg/max/mdev = %ld.%03ld/%ld.%03ld/" printf("rtt min/avg/max/mdev = %ld.%03ld/%ld.%03ld/"
"%ld.%03ld/%ld.%03ld ms\n", "%ld.%03ld/%ld.%03ld ms\n",

13
system/ping6/ping6.c
View File

@ -239,10 +239,17 @@ static void ping6_result(FAR const struct ping6_result_s *result)
result->extra / USEC_PER_MSEC); result->extra / USEC_PER_MSEC);
if (result->nreplies > 0) if (result->nreplies > 0)
{ {
long avg = priv->tsum / result->nreplies; long avg = 0;
long long tempnum = priv->tsum2 / result->nreplies - long long tempnum = 0;
long tmdev = 0;
if (priv->tsum > 0)
{
avg = priv->tsum / result->nreplies;
tempnum = priv->tsum2 / result->nreplies -
(long long)avg * avg; (long long)avg * avg;
long tmdev = ub16toi(ub32sqrtub16(uitoub32(tempnum))); tmdev = ub16toi(ub32sqrtub16(uitoub32(tempnum)));
}
printf("rtt min/avg/max/mdev = %ld.%03ld/%ld.%03ld/" printf("rtt min/avg/max/mdev = %ld.%03ld/%ld.%03ld/"
"%ld.%03ld/%ld.%03ld ms\n", "%ld.%03ld/%ld.%03ld ms\n",