From 0dbff99390d1a027d89d89762af23121224a9415 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 18 Mar 2022 22:21:20 +0100 Subject: SingleCRS::baseIsEquivalentTo(): fix potential crash that is triggered by fdf5111a9a790926aacec75a07d30508a8ed9c91 changes --- src/iso19111/crs.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index e4b8094f..e6f38e49 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -1460,7 +1460,8 @@ bool SingleCRS::baseIsEquivalentTo( const auto &thisDatum = d->datum; const auto &otherDatum = otherSingleCRS->d->datum; if (thisDatum) { - if (!thisDatum->_isEquivalentTo(otherDatum.get(), criterion, + if (otherDatum == nullptr || + !thisDatum->_isEquivalentTo(otherDatum.get(), criterion, dbContext)) { return false; } @@ -1473,7 +1474,8 @@ bool SingleCRS::baseIsEquivalentTo( const auto &thisDatumEnsemble = d->datumEnsemble; const auto &otherDatumEnsemble = otherSingleCRS->d->datumEnsemble; if (thisDatumEnsemble) { - if (!thisDatumEnsemble->_isEquivalentTo(otherDatumEnsemble.get(), + if (otherDatumEnsemble == nullptr || + !thisDatumEnsemble->_isEquivalentTo(otherDatumEnsemble.get(), criterion, dbContext)) { return false; } -- cgit v1.2.3