diff --git a/src/core/api/dataset_api.cpp b/src/core/api/dataset_api.cpp index e3573de2b..463155d21 100644 --- a/src/core/api/dataset_api.cpp +++ b/src/core/api/dataset_api.cpp @@ -44,12 +44,16 @@ using namespace ot; bool otDatasetIsCommissioned(otInstance *aInstance) { otOperationalDataset dataset; + bool rval = false; - otDatasetGetActive(aInstance, &dataset); + SuccessOrExit(otDatasetGetActive(aInstance, &dataset)); - return ((dataset.mComponents.mIsMasterKeyPresent) && (dataset.mComponents.mIsNetworkNamePresent) && + rval = ((dataset.mComponents.mIsMasterKeyPresent) && (dataset.mComponents.mIsNetworkNamePresent) && (dataset.mComponents.mIsExtendedPanIdPresent) && (dataset.mComponents.mIsPanIdPresent) && (dataset.mComponents.mIsChannelPresent)); + +exit: + return rval; } otError otDatasetGetActive(otInstance *aInstance, otOperationalDataset *aDataset)