From e9a4eb57b973cdabfc3067f24026b7781a9020e5 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Tue, 23 Jan 2018 22:45:41 +0800 Subject: [PATCH] Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master' Fix hexdump comment and array size. See issue #1518. See merge request !1832 --- components/log/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;