RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-11-30 Jennifer Averett <jennifer@OARcorp.com>

Browse Source 
This was tracked as PR88.
	* libc/scandir.c: Fixed to perform cleanup on error conditions.
This commit is contained in:
Joel Sherrill
2001-11-30 12:03:15 +00:00
parent 7fe83def1b
commit c43d7bd117
4 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
c/src/exec/libcsupport/src/scandir.c
View File

@@ -83,16 +83,19 @@ scandir(dirname, namelist, select, dcomp)
int (*select) __P((struct dirent *)); int (*select) __P((struct dirent *));
int (*dcomp) __P((const void *, const void *)); int (*dcomp) __P((const void *, const void *));
{ {
register struct dirent *d, *p, **names; register struct dirent *d = NULL;
register struct dirent *p = NULL;
register struct dirent **names = NULL;
register size_t nitems; register size_t nitems;
struct stat stb; struct stat stb;
long arraysz; long arraysz;
DIR *dirp; DIR *dirp = NULL;
int i;
if ((dirp = opendir(dirname)) == NULL) if ((dirp = opendir(dirname)) == NULL)
return(-1); return(-1);
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); goto cleanup_and_bail;
/* /*
* estimate the array size by taking the size of the directory file * estimate the array size by taking the size of the directory file
@@ -101,7 +104,7 @@ scandir(dirname, namelist, select, dcomp)
arraysz = (stb.st_size / 24); arraysz = (stb.st_size / 24);
names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *)); names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
nitems = 0; nitems = 0;
while ((d = readdir(dirp)) != NULL) { while ((d = readdir(dirp)) != NULL) {
@@ -112,7 +115,7 @@ scandir(dirname, namelist, select, dcomp)
*/ */
p = (struct dirent *)malloc(DIRSIZ(d)); p = (struct dirent *)malloc(DIRSIZ(d));
if (p == NULL) if (p == NULL)
return(-1); goto cleanup_and_bail;
p->d_ino = d->d_ino; p->d_ino = d->d_ino;
p->d_reclen = d->d_reclen; p->d_reclen = d->d_reclen;
p->d_namlen = d->d_namlen; p->d_namlen = d->d_namlen;
@@ -123,12 +126,12 @@ scandir(dirname, namelist, select, dcomp)
*/ */
if (++nitems >= arraysz) { if (++nitems >= arraysz) {
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); /* just might have grown */ goto cleanup_and_bail; /* just might have grown */
arraysz = stb.st_size / 12; arraysz = stb.st_size / 12;
names = (struct dirent **)realloc((char *)names, names = (struct dirent **)realloc((char *)names,
arraysz * sizeof(struct dirent *)); arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
} }
names[nitems-1] = p; names[nitems-1] = p;
} }
@@ -138,6 +141,19 @@ scandir(dirname, namelist, select, dcomp)
} }
*namelist = names; *namelist = names;
return(nitems); return(nitems);
cleanup_and_bail:
if ( dirp )
closedir( dirp );
if ( names ) {
for (i=0; i < nitems; i++ )
free( names[i] );
free( names );
}
return(-1);
} }
/* /*

5
c/src/lib/ChangeLog
View File

@@ -1,3 +1,8 @@
2001-11-30 Jennifer Averett <jennifer@OARcorp.com>
This was tracked as PR88.
* libc/scandir.c: Fixed to perform cleanup on error conditions.
2001-11-07 Jennifer Averett <jennifer@OARcorp.com> 2001-11-07 Jennifer Averett <jennifer@OARcorp.com>
Reported by Ibragimov Ilya <ibr@oktet.ru> and tracked as PR63. Reported by Ibragimov Ilya <ibr@oktet.ru> and tracked as PR63.

30
c/src/lib/libc/scandir.c
View File

@@ -83,16 +83,19 @@ scandir(dirname, namelist, select, dcomp)
int (*select) __P((struct dirent *)); int (*select) __P((struct dirent *));
int (*dcomp) __P((const void *, const void *)); int (*dcomp) __P((const void *, const void *));
{ {
register struct dirent *d, *p, **names; register struct dirent *d = NULL;
register struct dirent *p = NULL;
register struct dirent **names = NULL;
register size_t nitems; register size_t nitems;
struct stat stb; struct stat stb;
long arraysz; long arraysz;
DIR *dirp; DIR *dirp = NULL;
int i;
if ((dirp = opendir(dirname)) == NULL) if ((dirp = opendir(dirname)) == NULL)
return(-1); return(-1);
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); goto cleanup_and_bail;
/* /*
* estimate the array size by taking the size of the directory file * estimate the array size by taking the size of the directory file
@@ -101,7 +104,7 @@ scandir(dirname, namelist, select, dcomp)
arraysz = (stb.st_size / 24); arraysz = (stb.st_size / 24);
names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *)); names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
nitems = 0; nitems = 0;
while ((d = readdir(dirp)) != NULL) { while ((d = readdir(dirp)) != NULL) {
@@ -112,7 +115,7 @@ scandir(dirname, namelist, select, dcomp)
*/ */
p = (struct dirent *)malloc(DIRSIZ(d)); p = (struct dirent *)malloc(DIRSIZ(d));
if (p == NULL) if (p == NULL)
return(-1); goto cleanup_and_bail;
p->d_ino = d->d_ino; p->d_ino = d->d_ino;
p->d_reclen = d->d_reclen; p->d_reclen = d->d_reclen;
p->d_namlen = d->d_namlen; p->d_namlen = d->d_namlen;
@@ -123,12 +126,12 @@ scandir(dirname, namelist, select, dcomp)
*/ */
if (++nitems >= arraysz) { if (++nitems >= arraysz) {
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); /* just might have grown */ goto cleanup_and_bail; /* just might have grown */
arraysz = stb.st_size / 12; arraysz = stb.st_size / 12;
names = (struct dirent **)realloc((char *)names, names = (struct dirent **)realloc((char *)names,
arraysz * sizeof(struct dirent *)); arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
} }
names[nitems-1] = p; names[nitems-1] = p;
} }
@@ -138,6 +141,19 @@ scandir(dirname, namelist, select, dcomp)
} }
*namelist = names; *namelist = names;
return(nitems); return(nitems);
cleanup_and_bail:
if ( dirp )
closedir( dirp );
if ( names ) {
for (i=0; i < nitems; i++ )
free( names[i] );
free( names );
}
return(-1);
} }
/* /*

30
cpukit/libcsupport/src/scandir.c
View File

@@ -83,16 +83,19 @@ scandir(dirname, namelist, select, dcomp)
int (*select) __P((struct dirent *)); int (*select) __P((struct dirent *));
int (*dcomp) __P((const void *, const void *)); int (*dcomp) __P((const void *, const void *));
{ {
register struct dirent *d, *p, **names; register struct dirent *d = NULL;
register struct dirent *p = NULL;
register struct dirent **names = NULL;
register size_t nitems; register size_t nitems;
struct stat stb; struct stat stb;
long arraysz; long arraysz;
DIR *dirp; DIR *dirp = NULL;
int i;
if ((dirp = opendir(dirname)) == NULL) if ((dirp = opendir(dirname)) == NULL)
return(-1); return(-1);
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); goto cleanup_and_bail;
/* /*
* estimate the array size by taking the size of the directory file * estimate the array size by taking the size of the directory file
@@ -101,7 +104,7 @@ scandir(dirname, namelist, select, dcomp)
arraysz = (stb.st_size / 24); arraysz = (stb.st_size / 24);
names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *)); names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
nitems = 0; nitems = 0;
while ((d = readdir(dirp)) != NULL) { while ((d = readdir(dirp)) != NULL) {
@@ -112,7 +115,7 @@ scandir(dirname, namelist, select, dcomp)
*/ */
p = (struct dirent *)malloc(DIRSIZ(d)); p = (struct dirent *)malloc(DIRSIZ(d));
if (p == NULL) if (p == NULL)
return(-1); goto cleanup_and_bail;
p->d_ino = d->d_ino; p->d_ino = d->d_ino;
p->d_reclen = d->d_reclen; p->d_reclen = d->d_reclen;
p->d_namlen = d->d_namlen; p->d_namlen = d->d_namlen;
@@ -123,12 +126,12 @@ scandir(dirname, namelist, select, dcomp)
*/ */
if (++nitems >= arraysz) { if (++nitems >= arraysz) {
if (fstat(dirp->dd_fd, &stb) < 0) if (fstat(dirp->dd_fd, &stb) < 0)
return(-1); /* just might have grown */ goto cleanup_and_bail; /* just might have grown */
arraysz = stb.st_size / 12; arraysz = stb.st_size / 12;
names = (struct dirent **)realloc((char *)names, names = (struct dirent **)realloc((char *)names,
arraysz * sizeof(struct dirent *)); arraysz * sizeof(struct dirent *));
if (names == NULL) if (names == NULL)
return(-1); goto cleanup_and_bail;
} }
names[nitems-1] = p; names[nitems-1] = p;
} }
@@ -138,6 +141,19 @@ scandir(dirname, namelist, select, dcomp)
} }
*namelist = names; *namelist = names;
return(nitems); return(nitems);
cleanup_and_bail:
if ( dirp )
closedir( dirp );
if ( names ) {
for (i=0; i < nitems; i++ )
free( names[i] );
free( names );
}
return(-1);
} }
/* /*