organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 05:55:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-21387 measunit: check for nullptr before calling delete

Browse source
This commit is contained in:
Hugo van der Merwe 2020-11-18 23:48:04 +01:00
parent 0ab995ec84
commit 35e950d35f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
icu4c/source/i18n/measunit.cpp
View file

@ -2105,7 +2105,9 @@ MeasureUnit &MeasureUnit::operator=(const MeasureUnit &other) {
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 @@ MeasureUnit &MeasureUnit::operator=(MeasureUnit &&other) noexcept {
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::clone() const {
}
MeasureUnit::~MeasureUnit() {
delete fImpl;
fImpl = nullptr;
if (fImpl != nullptr) {
delete fImpl;
fImpl = nullptr;
}
}
const char *MeasureUnit::getType() const {
@ -2298,8 +2304,10 @@ void MeasureUnit::initCurrency(StringPiece isoCurrency) {
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 {