From: Victor Julien <vjulien@oisf.net>
Date: Mon, 13 Jun 2022 10:55:52 +0000 (+0200)
Subject: file: consistently track size of gaps
X-Git-Tag: suricata-7.0.0-beta1~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71ef62bfc5ee8ffe4798467935f4f9386178565e;p=thirdparty%2Fsuricata.git

file: consistently track size of gaps

Until now only the size of gaps counted in the regular append, not
close and open.

Bug: #5392.
---

diff --git a/src/util-file.c b/src/util-file.c
index 6e1b730870..81913ae21e 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -900,8 +900,8 @@ static File *FileOpenFile(FileContainer *ffc, const StreamingBufferConfig *sbcfg
 
     FileContainerAdd(ffc, ff);
 
+    ff->size += data_len;
     if (data != NULL) {
-        ff->size += data_len;
         if (AppendData(ff, data, data_len) != 0) {
             ff->state = FILE_STATE_ERROR;
             SCReturnPtr(NULL, "File");
@@ -942,8 +942,8 @@ int FileCloseFilePtr(File *ff, const uint8_t *data,
         SCReturnInt(-1);
     }
 
+    ff->size += data_len;
     if (data != NULL) {
-        ff->size += data_len;
         if (ff->flags & FILE_NOSTORE) {
             /* no storage but hashing */
             if (ff->md5_ctx)