From c223c70644dd056d3b5970eb0dd193b9f6dd7846 Mon Sep 17 00:00:00 2001
From: Yat Ho <lagoho7@gmail.com>
Date: Mon, 25 Mar 2024 22:55:45 +0800
Subject: [PATCH] fix: potential nullptr deference in rpc (#6734)

---
 libtransmission/rpcimpl.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc
index 86093f4e4..3bd5b65ce 100644
--- a/libtransmission/rpcimpl.cc
+++ b/libtransmission/rpcimpl.cc
@@ -2122,6 +2122,7 @@ void tr_rpc_request_exec(tr_session* session, tr_variant const& request, tr_rpc_
     auto const empty_args = tr_variant::Map{};
     auto const* args_in = &empty_args;
     auto method_name = std::string_view{};
+    auto tag = std::optional<int64_t>{};
     if (request_map != nullptr)
     {
         // find the args
@@ -2135,9 +2136,9 @@ void tr_rpc_request_exec(tr_session* session, tr_variant const& request, tr_rpc_
         {
             method_name = *val;
         }
-    }
 
-    auto const tag = request_map->value_if<int64_t>(TR_KEY_tag);
+        tag = request_map->value_if<int64_t>(TR_KEY_tag);
+    }
 
     auto const test = [method_name](auto const& handler)
     {