d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two bugs introduced in conversion to FreeBSD source tree:

Browse Source 
Off by one error in length calcuation of string records.
Don't attempt to free stack variable.
This commit is contained in:
phk 2008-03-19 10:56:51 +00:00
parent d818a8db68
commit 394021fd91
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/fifolog/lib/fifolog_int.c
View File

@ -192,7 +192,6 @@ fifolog_int_close(struct fifolog_file **ff)
free(f->zs);
if (f->recbuf != NULL)
free(f->recbuf);
free(f);
}
static void

8
usr.sbin/fifolog/lib/fifolog_write_poll.c
View File

@ -93,6 +93,7 @@ fifolog_write_close(struct fifolog_writer *f)
CHECK_OBJ_NOTNULL(f, FIFOLOG_WRITER_MAGIC);
fifolog_int_close(&f->ff);
free(f->ff);
if (f->ibuf != NULL)
free(f->ibuf);
free(f);
@ -317,13 +318,12 @@ fifolog_write_bytes(struct fifolog_writer *f, uint32_t id, time_t now, const voi
assert(!(id & (FIFOLOG_TIMESTAMP|FIFOLOG_LENGTH)));
assert(ptr != NULL);
p = ptr;
if (len == 0) {
len = strlen(ptr);
len = strlen(ptr) + 1;
l = 4 + len; /* id */
p = ptr;
} else {
assert(len <= 255);
p = ptr;
id |= FIFOLOG_LENGTH;
l = 5 + len; /* id + len */
}
@ -336,7 +336,7 @@ fifolog_write_bytes(struct fifolog_writer *f, uint32_t id, time_t now, const voi
assert(l < f->ibufsize);
/* Wait until there is sufficient space without the lock */
/* Return if there is not enough space */
if (f->iptr + l > f->ibuf + f->ibufsize)
return (0);