From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Tue, 12 Sep 2017 19:58:06 +0000 (-0400)
Subject: Merge pull request #1012 in SNORT/snort3 from file_lib_fix to master
X-Git-Tag: 3.0.0-240~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8a5fb59fa78c39b3e4e05fc51ac3c3da3c0524e;p=thirdparty%2Fsnort3.git

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

Squashed commit of the following:

commit 7ac239558ebe5f37a6e96efa3e5ab01f39bfee7f
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Tue Sep 12 13:35:55 2017 -0400

    refix the fix on valgrind error for null terminator overwritten issue
---

diff --git a/src/file_api/file_lib.cc b/src/file_api/file_lib.cc
index 00418d820..2550fee16 100644
--- a/src/file_api/file_lib.cc
+++ b/src/file_api/file_lib.cc
@@ -602,11 +602,11 @@ 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)
             {
-                str[pos] = ' ';
                 pos++;
                 fprintf(fp, "%s", "    ");
             }
@@ -615,7 +615,6 @@ 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);
     }
 }