From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 11 Sep 2017 21:05:14 +0000 (-0400)
Subject: Merge pull request #1011 in SNORT/snort3 from file_lib_fix to master
X-Git-Tag: 3.0.0-240~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f855c93d8ccda0a76a57d0e150167ec07787388;p=thirdparty%2Fsnort3.git

Merge pull request #1011 in SNORT/snort3 from file_lib_fix to master

Squashed commit of the following:

commit e23f9254f747db77ad1263800810cb2cd3ae9715
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Mon Sep 11 15:08:58 2017 -0400

    Fixed a valgrind error -- null terminator overwritten when length equals 8
---

diff --git a/src/file_api/file_lib.cc b/src/file_api/file_lib.cc
index cbfc80089..00418d820 100644
--- a/src/file_api/file_lib.cc
+++ b/src/file_api/file_lib.cc
@@ -602,7 +602,6 @@ void FileContext::print_file_data(FILE* fp, const uint8_t* data, int len, int ma
     }
     if (pos)
     {
-        str[pos] = 0;
         for (; pos < 17; pos++)
         {
             if (pos == 8)
@@ -616,6 +615,7 @@ void FileContext::print_file_data(FILE* fp, const uint8_t* data, int len, int ma
                 fprintf(fp, "%s", "   ");
             }
         }
+        str[pos] = 0;
         fprintf(fp, "  %s\n", str);
     }
 }