Changeset 19b74f31 in rtems

Timestamp:

Nov 2, 1999, 4:25:05 PM (20 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

a504ced3

Parents:

3fb2a8d

Message:

Check for NULL being passed in.

Files:

• c/src/exec/libcsupport/src/readdir.c (modified) (1 diff)
• c/src/exec/libcsupport/src/rewinddir.c (modified) (1 diff)
• c/src/exec/libcsupport/src/seekdir.c (modified) (2 diffs)
• c/src/exec/libcsupport/src/telldir.c (modified) (2 diffs)
• c/src/lib/libc/readdir.c (modified) (1 diff)
• c/src/lib/libc/rewinddir.c (modified) (1 diff)
• c/src/lib/libc/seekdir.c (modified) (2 diffs)
• c/src/lib/libc/telldir.c (modified) (2 diffs)
• cpukit/libcsupport/src/readdir.c (modified) (1 diff)
• cpukit/libcsupport/src/rewinddir.c (modified) (1 diff)
• cpukit/libcsupport/src/seekdir.c (modified) (2 diffs)
• cpukit/libcsupport/src/telldir.c (modified) (2 diffs)

c/src/exec/libcsupport/src/readdir.c

@@ -57 +57 @@
   register struct dirent *dp;
   
+  if ( !dirp )
+    return NULL;
+
   for (;;) {
     if (dirp->dd_loc == 0) {

c/src/exec/libcsupport/src/rewinddir.c

@@ -25 +25 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, 0, SEEK_SET );
  

c/src/exec/libcsupport/src/seekdir.c

@@ -26 +26 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, loc, SEEK_SET );
 
@@ -31 +34 @@
    * This is not a nice way to error out, but we have no choice here.
    */
-  if( status == -1 ) 
+
+  if ( status == -1 ) 
     return;
 

c/src/exec/libcsupport/src/telldir.c

@@ -17 +17 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "libio_.h"
@@ -27 +28 @@
   rtems_libio_t  *iop;
 
+  if ( !dirp )
+    set_errno_and_return_minus_one( EBADF ); 
+
   /*
-   *  Get the file control block structure associated with the file descriptor
+   *  Get the file control block structure associated with the
+   *  file descriptor
    */
 

c/src/lib/libc/readdir.c

@@ -57 +57 @@
   register struct dirent *dp;
   
+  if ( !dirp )
+    return NULL;
+
   for (;;) {
     if (dirp->dd_loc == 0) {

c/src/lib/libc/rewinddir.c

@@ -25 +25 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, 0, SEEK_SET );
  

c/src/lib/libc/seekdir.c

@@ -26 +26 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, loc, SEEK_SET );
 
@@ -31 +34 @@
    * This is not a nice way to error out, but we have no choice here.
    */
-  if( status == -1 ) 
+
+  if ( status == -1 ) 
     return;
 

c/src/lib/libc/telldir.c

@@ -17 +17 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "libio_.h"
@@ -27 +28 @@
   rtems_libio_t  *iop;
 
+  if ( !dirp )
+    set_errno_and_return_minus_one( EBADF ); 
+
   /*
-   *  Get the file control block structure associated with the file descriptor
+   *  Get the file control block structure associated with the
+   *  file descriptor
    */
 

cpukit/libcsupport/src/readdir.c

@@ -57 +57 @@
   register struct dirent *dp;
   
+  if ( !dirp )
+    return NULL;
+
   for (;;) {
     if (dirp->dd_loc == 0) {

cpukit/libcsupport/src/rewinddir.c

@@ -25 +25 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, 0, SEEK_SET );
  

cpukit/libcsupport/src/seekdir.c

@@ -26 +26 @@
   off_t status;
 
+  if ( !dirp )
+    return;
+
   status = lseek( dirp->dd_fd, loc, SEEK_SET );
 
@@ -31 +34 @@
    * This is not a nice way to error out, but we have no choice here.
    */
-  if( status == -1 ) 
+
+  if ( status == -1 ) 
     return;
 

cpukit/libcsupport/src/telldir.c

@@ -17 +17 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "libio_.h"
@@ -27 +28 @@
   rtems_libio_t  *iop;
 
+  if ( !dirp )
+    set_errno_and_return_minus_one( EBADF ); 
+
   /*
-   *  Get the file control block structure associated with the file descriptor
+   *  Get the file control block structure associated with the
+   *  file descriptor
    */