From: Jiang Jiang Jian <jack@espressif.com>
Date: Tue, 23 Jan 2018 14:45:41 +0000 (+0800)
Subject: Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master'
X-Git-Tag: v3.0~63^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9a4eb57b973cdabfc3067f24026b7781a9020e5;p=esp-idf

Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master'

Fix hexdump comment and array size. See issue #1518.

See merge request !1832
---

diff --git a/components/log/log.c b/components/log/log.c
index 370c8b01ce..589f1983a1 100644
--- a/components/log/log.c
+++ b/components/log/log.c
@@ -419,8 +419,8 @@ void esp_log_buffer_hexdump_internal( const char *tag, const void *buffer, uint1
     char temp_buffer[BYTES_PER_LINE+3];   //for not-byte-accessible memory
     const char *ptr_line;
     //format: field[length]
-    // ADDR[10]+" "+DATA_HEX[8*3]+" "+DATA_HEX[8*3]+"  |"+DATA_CHAR[8]+"|"
-    char hd_buffer[10+2+BYTES_PER_LINE*3+3+BYTES_PER_LINE+1+1];
+    // ADDR[10]+"   "+DATA_HEX[8*3]+" "+DATA_HEX[8*3]+"  |"+DATA_CHAR[8]+"|"
+    char hd_buffer[10+3+BYTES_PER_LINE*3+3+BYTES_PER_LINE+1+1];
     char *ptr_hd;
     int bytes_cur_line;