1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-21 15:45:02 +00:00

- Fix an improperly sized buffer for pathname [1]

- Fix a -Wunused-but-set-variable warning [2]

MFC after: 1 week
Reported by: cppcheck [1], gcc 4.9 [2]
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-12-28 02:21:36 +00:00
parent fc8e5f5fd4
commit 0b0ac0beb2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=292819

View File

@ -62,7 +62,7 @@ main(int argc, char *argv[])
{
int fd;
struct aiocb *iocb[MAX_IOCBS];
struct aiocb **lio[LIO_MAX], **lio_element, **kq_lio;
struct aiocb **lio[LIO_MAX], **kq_lio;
int i, result, run, error, j, k;
char buffer[32768];
int kq;
@ -70,7 +70,7 @@ main(int argc, char *argv[])
struct timespec ts;
struct sigevent sig;
time_t time1, time2;
char *file, pathname[sizeof(PATH_TEMPLATE)-1];
char *file, pathname[sizeof(PATH_TEMPLATE)];
int tmp_file = 0, failed = 0;
PLAIN_REQUIRE_KERNEL_MODULE("aio", 0);
@ -104,7 +104,6 @@ main(int argc, char *argv[])
malloc(sizeof(struct aiocb *) * MAX_IOCBS/LIO_MAX);
for (i = 0; i < MAX_IOCBS / LIO_MAX; i++) {
k = (MAX_IOCBS / LIO_MAX * j) + i;
lio_element = lio[j];
lio[j][i] = iocb[k] =
calloc(1, sizeof(struct aiocb));
iocb[k]->aio_nbytes = sizeof(buffer);