Changeset 9f114a8 in rtems

Timestamp:

05/20/05 19:33:23 (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

182813e

Parents:

862cbe3a

Message:

2005-05-20 Sergei Organov <osv@…>

PR 750/networking

• libnetworking/pppd/sys-rtems.c: Avoid NULL dereference in wait_input().

Files:

• c/src/ChangeLog (modified) (1 diff)
• c/src/libnetworking/pppd/sys-rtems.c (modified) (1 diff)
• cpukit/pppd/sys-rtems.c (modified) (1 diff)

c/src/ChangeLog

@@ +1 @@
+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>
 

c/src/libnetworking/pppd/sys-rtems.c

@@ -514 +514 @@
     struct timeval *timo;
 {
-  rtems_interval     ticks;
   rtems_event_set    events;
-
-  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);
+  rtems_interval     ticks = 0;
+  rtems_option       wait = RTEMS_WAIT;
+
+  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);
 }
 

cpukit/pppd/sys-rtems.c

@@ -514 +514 @@
     struct timeval *timo;
 {
-  rtems_interval     ticks;
   rtems_event_set    events;
-
-  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);
+  rtems_interval     ticks = 0;
+  rtems_option       wait = RTEMS_WAIT;
+
+  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);
 }