xan/hexagram
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hmmst'd've

Browse source
This commit is contained in:
XANTRONIX Development 2019-05-07 22:16:40 -05:00
parent 59e482d27d
commit 4bfbd754ea
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/Makefile
View file

@ -8,7 +8,7 @@ CFLAGS += -I$(INCLUDE_PATH)
LDFLAGS = -L../src -lhexagram LDFLAGS = -L../src -lhexagram
STATIC = ../src/libhexagram.a STATIC = ../src/libhexagram.a
EXAMPLES = duration view EXAMPLES = view
RM = /bin/rm RM = /bin/rm

5
src/pcapng.c
View file

@ -22,6 +22,7 @@ ssize_t hexagram_pcapng_read_options(hexagram_pcapng_stream *stream,
while (total < len) { while (total < len) {
ssize_t readlen; ssize_t readlen;
size_t remaining;
if ((readlen = read(stream->fd, &option, sizeof(option))) < 0) { if ((readlen = read(stream->fd, &option, sizeof(option))) < 0) {
stream->error = HEXAGRAM_PCAPNG_ERROR_IO; stream->error = HEXAGRAM_PCAPNG_ERROR_IO;
@ -41,8 +42,8 @@ ssize_t hexagram_pcapng_read_options(hexagram_pcapng_stream *stream,
total += readlen; total += readlen;
} }
if (option.length % sizeof(uint32_t)) { if ((remaining = option.length % sizeof(uint32_t)) > 0) {
size_t padding = sizeof(uint32_t) - (option.length % sizeof(uint32_t)); size_t padding = sizeof(uint32_t) - remaining;
if ((readlen = lseek(stream->fd, padding, SEEK_CUR)) < 0) { if ((readlen = lseek(stream->fd, padding, SEEK_CUR)) < 0) {
goto error_io; goto error_io;