From 22824e5f07fee2a26cf67bc475e38a24eeaa0527 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Wed, 4 Dec 2019 22:59:24 +0800
Subject: [PATCH] bugfix: init pReader->binlog_buff.version/length to 0

---
 HISTORY                | 1 +
 storage/storage_sync.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 16f2f0b..6cd7a18 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ Version 6.04  2019-12-04
  * use get_gzip_command_filename from libfastcommon v1.42
  * support compress error log and access log
  * disk recovery support multi-threads to speed up
+ * bugfix: init pReader->binlog_buff.version/length to 0
 
   NOTE: you MUST upgrade libfastcommon to V1.42 or later
 
diff --git a/storage/storage_sync.c b/storage/storage_sync.c
index 08b0645..9d6103d 100644
--- a/storage/storage_sync.c
+++ b/storage/storage_sync.c
@@ -2207,6 +2207,8 @@ int storage_reader_init(FDFSStorageBrief *pStorage, StorageBinLogReader *pReader
     pReader->sync_row_count = 0;
     pReader->last_file_exist = 0;
 	pReader->binlog_fd = -1;
+    pReader->binlog_buff.version = 0;
+    pReader->binlog_buff.length = 0;
 
 	pReader->binlog_buff.buffer = (char *)malloc( \
 				STORAGE_BINLOG_BUFFER_SIZE);
@@ -2477,7 +2479,7 @@ static int storage_binlog_preread(StorageBinLogReader *pReader)
 	int bytes_read;
 	int saved_binlog_write_version;
 
-	if (pReader->binlog_buff.version == binlog_write_version && \
+	if (pReader->binlog_buff.version == binlog_write_version &&
 		pReader->binlog_buff.length == 0)
 	{
 		return ENOENT;