From 0b76aa6eaccbf0fe85bc38b53d858066684ff77c Mon Sep 17 00:00:00 2001
From: Jeffrey Xiao <jeffrey.xiao1998@gmail.com>
Date: Tue, 25 Jun 2019 16:01:11 -0400
Subject: [PATCH] storage: fix null pointer dereference in AdminMerge

Release note: None
---
 pkg/storage/replica_command.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/storage/replica_command.go b/pkg/storage/replica_command.go
index feed48183604..e1ef8a903b35 100644
--- a/pkg/storage/replica_command.go
+++ b/pkg/storage/replica_command.go
@@ -531,7 +531,7 @@ func (r *Replica) AdminMerge(
 		if err != nil {
 			return err
 		}
-		if err := dbRightDescKV.Value.GetProto(&rightDesc); err != nil {
+		if err := dbRightDescKV.ValueProto(&rightDesc); err != nil {
 			return err
 		}