connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
New commits: commit cc396384b13a71a5ac2732d22b076c98316d64a0 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Aug 16 09:24:15 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Aug 17 00:35:53 2022 +0200 cid#1500701 silence Dereference after null check Change-Id: Ic982e7d46688628396d659d0c1a9d17fdb8c43a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138360 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 36ef9f287347..fbbd25fbdea3 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -341,9 +341,14 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ #endif std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); - Reference< XSeekable> xSeek = pHelper ? pHelper->getSeek() : Reference< XSeekable>(); - OSL_ENSURE(xSeek.is(),"No Seekable stream!"); + OSL_ENSURE(pHelper, "No StreamHelper!"); + if (!pHelper) + return; + + Reference< XSeekable> xSeek = pHelper->getSeek(); + + OSL_ENSURE(xSeek.is(), "No Seekable stream!"); if (!xSeek) return;
