From bd830a6f3faae20f9a1b9ca00b045101380a9504 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 22 Feb 2022 17:11:37 +0100
Subject: UnitOfMeasure::operator=(UnitOfMeasure &&): avoid use of moved member
 (CID 383358)

---
 src/iso19111/common.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/iso19111/common.cpp b/src/iso19111/common.cpp
index b70845ae..1d7e2030 100644
--- a/src/iso19111/common.cpp
+++ b/src/iso19111/common.cpp
@@ -120,8 +120,9 @@ UnitOfMeasure &UnitOfMeasure::operator=(const UnitOfMeasure &other) {
 
 //! @cond Doxygen_Suppress
 UnitOfMeasure &UnitOfMeasure::operator=(UnitOfMeasure &&other) {
-    BaseObject::operator=(std::move(static_cast<BaseObject &&>(other)));
     *d = std::move(*(other.d));
+    other.d = nullptr;
+    BaseObject::operator=(std::move(static_cast<BaseObject &&>(other)));
     return *this;
 }
 //! @endcond
-- 
cgit v1.2.3