Changeset 812f440 in rtems

Timestamp:

10/21/99 16:38:49 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9583f6e

Parents:

39537657

Message:

Fixed core dump caused when output parameter (otimer) was NULL.

Files:

• c/src/exec/posix/src/ptimer.c (modified) (4 diffs)
• cpukit/posix/src/ptimer.c (modified) (4 diffs)

c/src/exec/posix/src/ptimer.c

@@ -590 +590 @@
    int               timer_pos;  /* Position of the timer in the table  */
    rtems_time_of_day rtems_time; /* Time in RTEMS                       */
+   
 
    /* First the position in the table of timers is obtained */
@@ -624 +625 @@
       /* The old data of the timer are returned */
 
-      COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+      if ( ovalue )
+        COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
       /* The new data are set */
@@ -683 +685 @@
                * returns the old ones in "ovalue" */
 
-              COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+              if ( ovalue )
+                COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
               COPY_ITIMERSPEC_S ( value, &timer_struct[timer_pos].timer_data );
@@ -758 +761 @@
                * returns the old ones in "ovalue" */
 
-              COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+              if ( ovalue )
+                COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
               COPY_ITIMERSPEC_S ( value, &timer_struct[timer_pos].timer_data );

cpukit/posix/src/ptimer.c

@@ -590 +590 @@
    int               timer_pos;  /* Position of the timer in the table  */
    rtems_time_of_day rtems_time; /* Time in RTEMS                       */
+   
 
    /* First the position in the table of timers is obtained */
@@ -624 +625 @@
       /* The old data of the timer are returned */
 
-      COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+      if ( ovalue )
+        COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
       /* The new data are set */
@@ -683 +685 @@
                * returns the old ones in "ovalue" */
 
-              COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+              if ( ovalue )
+                COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
               COPY_ITIMERSPEC_S ( value, &timer_struct[timer_pos].timer_data );
@@ -758 +761 @@
                * returns the old ones in "ovalue" */
 
-              COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
+              if ( ovalue )
+                COPY_ITIMERSPEC_S ( &timer_struct[timer_pos].timer_data, ovalue );
 
               COPY_ITIMERSPEC_S ( value, &timer_struct[timer_pos].timer_data );