commit 35e950d35fea0cad481205981344c4983469e22f
author Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Wed Nov 18 23:48:04 2020 +0100
committer Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Wed Nov 25 00:19:07 2020 +0100
tree 3432c5ccd5ba0a1dad38ace01a1c01793ac4ea20
parent 0ab995ec84a31be12f669a156c59c3eaba39f10f

ICU-21387 measunit: check for nullptr before calling delete

icu4c/source/i18n/measunit.cpp

diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp
index dab3abb..c3e39b9 100644
--- a/icu4c/source/i18n/measunit.cpp
+++ b/icu4c/source/i18n/measunit.cpp
@@ -2105,7 +2105,9 @@
     if (this == &other) {
         return *this;
     }
-    delete fImpl;
+    if (fImpl != nullptr) {
+        delete fImpl;
+    }
     if (other.fImpl) {
         ErrorCode localStatus;
         fImpl = new MeasureUnitImpl(other.fImpl->copy(localStatus));
@@ -2126,7 +2128,9 @@
     if (this == &other) {
         return *this;
     }
-    delete fImpl;
+    if (fImpl != nullptr) {
+        delete fImpl;
+    }
     fImpl = other.fImpl;
     other.fImpl = nullptr;
     fTypeId = other.fTypeId;
@@ -2139,8 +2143,10 @@
 }
 
 MeasureUnit::~MeasureUnit() {
-    delete fImpl;
-    fImpl = nullptr;
+    if (fImpl != nullptr) {
+        delete fImpl;
+        fImpl = nullptr;
+    }
 }
 
 const char *MeasureUnit::getType() const {
@@ -2298,8 +2304,10 @@
 void MeasureUnit::setTo(int32_t typeId, int32_t subTypeId) {
     fTypeId = typeId;
     fSubTypeId = subTypeId;
-    delete fImpl;
-    fImpl = nullptr;
+    if (fImpl != nullptr) {
+        delete fImpl;
+        fImpl = nullptr;
+    }
 }
 
 int32_t MeasureUnit::getOffset() const {