If the initial call to ftell() fails, variable orig_offset is set to -1.
Avoid passing this to fseek() later on.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
src/erec.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/erec.c b/src/erec.c
index 80806ffeee949..8de249de8b78d 100644
--- a/src/erec.c
+++ b/src/erec.c
@@ -121,7 +121,7 @@ void erec_print(struct output_ctx *octx, const struct error_record *erec,
char buf[1024] = {};
char *pbuf = NULL;
unsigned int i, end;
- int l, ret;
+ int l;
off_t orig_offset = 0;
FILE *f = octx->output_fp;
@@ -136,12 +136,12 @@ void erec_print(struct output_ctx *octx, const struct error_record *erec,
break;
case INDESC_FILE:
orig_offset = ftell(indesc->fp);
- fseek(indesc->fp, loc->line_offset, SEEK_SET);
- ret = fread(buf, 1, sizeof(buf) - 1, indesc->fp);
- if (ret > 0)
+ if (orig_offset >= 0 &&
+ !fseek(indesc->fp, loc->line_offset, SEEK_SET) &&
+ fread(buf, 1, sizeof(buf) - 1, indesc->fp) > 0 &&
+ !fseek(indesc->fp, orig_offset, SEEK_SET))
*strchrnul(buf, '\n') = '\0';
line = buf;
- fseek(indesc->fp, orig_offset, SEEK_SET);
break;
case INDESC_INTERNAL:
case INDESC_NETLINK:
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
