From 1b1a1e7bc6fc39fc2f2976e962c44468a79985d3 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Tue, 13 Nov 2018 15:17:03 -0800
Subject: [PATCH] [mle] avoid shadow declaration with kVersion (#3294)

Credit to OSS-Fuzz.
---
 src/core/thread/mle.cpp           | 4 ++--
 src/core/thread/mle_constants.hpp | 2 +-
 src/core/thread/mle_router.cpp    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index 9805efc92..656daacd1 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -527,7 +527,7 @@ otError Mle::Discover(uint32_t        aScanChannels,
 
     // Discovery Request TLV
     discoveryRequest.Init();
-    discoveryRequest.SetVersion(kVersion);
+    discoveryRequest.SetVersion(kThreadVersion);
     discoveryRequest.SetJoiner(aJoiner);
     SuccessOrExit(error = message->Append(&discoveryRequest, sizeof(discoveryRequest)));
 
@@ -1304,7 +1304,7 @@ otError Mle::AppendVersion(Message &aMessage)
     VersionTlv tlv;
 
     tlv.Init();
-    tlv.SetVersion(kVersion);
+    tlv.SetVersion(kThreadVersion);
 
     return aMessage.Append(&tlv, sizeof(tlv));
 }
diff --git a/src/core/thread/mle_constants.hpp b/src/core/thread/mle_constants.hpp
index bdb3800da..6606f3600 100644
--- a/src/core/thread/mle_constants.hpp
+++ b/src/core/thread/mle_constants.hpp
@@ -57,7 +57,7 @@ enum
  */
 enum
 {
-    kVersion                        = 2,     ///< MLE Version
+    kThreadVersion                  = 2,     ///< Thread Version
     kUdpPort                        = 19788, ///< MLE UDP Port
     kParentRequestRouterTimeout     = 750,   ///< Router Parent Request timeout
     kParentRequestReedTimeout       = 1250,  ///< Router and REEDs Parent Request timeout
diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
index 7c28f5240..dc403e56a 100644
--- a/src/core/thread/mle_router.cpp
+++ b/src/core/thread/mle_router.cpp
@@ -600,7 +600,7 @@ otError MleRouter::HandleLinkRequest(const Message &aMessage, const Ip6::Message
 
     // Version
     SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kVersion, sizeof(version), version));
-    VerifyOrExit(version.IsValid() && version.GetVersion() >= kVersion, error = OT_ERROR_PARSE);
+    VerifyOrExit(version.IsValid() && version.GetVersion() >= kThreadVersion, error = OT_ERROR_PARSE);
 
     // Leader Data
     if (Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData) == OT_ERROR_NONE)
@@ -1609,7 +1609,7 @@ otError MleRouter::HandleParentRequest(const Message &aMessage, const Ip6::Messa
 
     // Version
     SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kVersion, sizeof(version), version));
-    VerifyOrExit(version.IsValid() && version.GetVersion() >= kVersion, error = OT_ERROR_PARSE);
+    VerifyOrExit(version.IsValid() && version.GetVersion() >= kThreadVersion, error = OT_ERROR_PARSE);
 
     // Scan Mask
     SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kScanMask, sizeof(scanMask), scanMask));
@@ -2733,7 +2733,7 @@ otError MleRouter::SendDiscoveryResponse(const Ip6::Address &aDestination, uint1
 
     // Discovery Response TLV
     discoveryResponse.Init();
-    discoveryResponse.SetVersion(kVersion);
+    discoveryResponse.SetVersion(kThreadVersion);
 
     if (netif.GetKeyManager().GetSecurityPolicyFlags() & OT_SECURITY_POLICY_NATIVE_COMMISSIONING)
     {