From 49d51e949b9b70d9c1d2fdde37bd9e2e595a0984 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Mon, 23 Dec 2019 08:13:40 +0800
Subject: [PATCH] fix previous value in trunk_save_merged_spaces

---
 HISTORY                       | 2 +-
 common/fdfs_global.c          | 2 +-
 storage/trunk_mgr/trunk_mem.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 9a19868..c77a6de 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,5 @@
 
-Version 6.05  2019-12-22
+Version 6.05  2019-12-23
  * fdfs_trackerd and fdfs_storaged print the server version in usage.
    you can execute fdfs_trackerd or fdfs_storaged without parameters
    to show the server version
diff --git a/common/fdfs_global.c b/common/fdfs_global.c
index 87d8c22..375ab2e 100644
--- a/common/fdfs_global.c
+++ b/common/fdfs_global.c
@@ -23,7 +23,7 @@
 int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT;
 int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT;
 char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'};
-Version g_fdfs_version = {6, 4};
+Version g_fdfs_version = {6, 5};
 bool g_use_connection_pool = false;
 ConnectionPool g_connection_pool;
 int g_connection_pool_max_idle_time = 3600;
diff --git a/storage/trunk_mgr/trunk_mem.c b/storage/trunk_mgr/trunk_mem.c
index 54977bb..2e49d8f 100644
--- a/storage/trunk_mgr/trunk_mem.c
+++ b/storage/trunk_mgr/trunk_mem.c
@@ -591,14 +591,14 @@ static int trunk_save_merged_spaces(struct walk_callback_args *pCallbackArgs)
     ppEnd = pCallbackArgs->trunk_array.trunks +
         pCallbackArgs->trunk_array.count;
     ppTrunkInfo = pCallbackArgs->trunk_array.trunks;
-    ppMergeFirst = ppTrunkInfo;
+    ppMergeFirst = previous = ppTrunkInfo;
 	while (++ppTrunkInfo < ppEnd)
 	{
-        previous = ppTrunkInfo - 1;
         if (trunk_compare_path_and_id(*previous, *ppTrunkInfo) == 0 &&
                 (*previous)->file.offset + (*previous)->file.size ==
                 (*ppTrunkInfo)->file.offset)
         {
+            previous = ppTrunkInfo;
             continue;
         }
 
@@ -611,7 +611,7 @@ static int trunk_save_merged_spaces(struct walk_callback_args *pCallbackArgs)
             return result;
         }
 
-        ppMergeFirst = ppTrunkInfo;
+        ppMergeFirst = previous = ppTrunkInfo;
 	}
 
     if (ppEnd - ppMergeFirst > 1)