diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-05-20 19:33:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-05-20 19:33:23 +0000 |
| commit | 9f114a806ae20d3be9fafb3bcd29e850c4cabebc (patch) | |
| tree | d6f0d6f6ab8730206eb34c536bec175da54085be /c | |
| parent | 2005-05-20 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-9f114a806ae20d3be9fafb3bcd29e850c4cabebc.tar.bz2 | |
2005-05-20 Sergei Organov <osv@topconrd.ru>
PR 750/networking
* libnetworking/pppd/sys-rtems.c: Avoid NULL dereference in
wait_input().
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libnetworking/pppd/sys-rtems.c | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index ce7bcb58db..211b0094a5 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2005-05-20 Sergei Organov <osv@topconrd.ru> + + PR 750/networking + * libnetworking/pppd/sys-rtems.c: Avoid NULL dereference in + wait_input(). + 2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com> * libchip/network/if_fxp.c, libchip/serial/ns16550.c: Modified to use diff --git a/c/src/libnetworking/pppd/sys-rtems.c b/c/src/libnetworking/pppd/sys-rtems.c index f85a571aa0..79580482ff 100644 --- a/c/src/libnetworking/pppd/sys-rtems.c +++ b/c/src/libnetworking/pppd/sys-rtems.c @@ -513,13 +513,21 @@ void wait_input(timo) struct timeval *timo; { - rtems_interval ticks; rtems_event_set events; + rtems_interval ticks = 0; + rtems_option wait = RTEMS_WAIT; - ticks = ((timo->tv_sec*1000000)+timo->tv_usec)/rtems_bsdnet_microseconds_per_tick; - if ( ticks > 0 ) { - rtems_event_receive(RTEMS_EVENT_31, (RTEMS_EVENT_ANY|RTEMS_WAIT), ticks, &events); + if(timo) { + if(timo->tv_sec == 0 && timo->tv_usec == 0) + wait = RTEMS_NO_WAIT; + else { + ticks = (timo->tv_sec * 1000000 + timo->tv_usec) / + rtems_bsdnet_microseconds_per_tick; + if(ticks <= 0) + ticks = 1; + } } + rtems_event_receive(RTEMS_EVENT_31, RTEMS_EVENT_ANY | wait, ticks, &events); } /* |