From 7c3c2cad3c5e95fac151debc89c2f5629b4c6b21 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 30 Jan 2026 15:18:43 -0800 Subject: Many small code quality fixes --- src/burn/engine/logging.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/burn/engine/logging.cpp') diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp index 51b546ad..52123499 100644 --- a/src/burn/engine/logging.cpp +++ b/src/burn/engine/logging.cpp @@ -322,15 +322,17 @@ extern "C" HRESULT LoggingSetPackageVariable( ExitFunction(); } - // For burn packages we'll add logging even it it wasn't explictly specified + // For burn packages we'll add logging even it it wasn't explictly specified. if (BURN_PACKAGE_TYPE_BUNDLE == pPackage->type || (BURN_PACKAGE_TYPE_EXE == pPackage->type && BURN_EXE_PROTOCOL_TYPE_BURN == pPackage->Exe.protocol)) { if (!fRollback && (!pPackage->sczLogPathVariable || !*pPackage->sczLogPathVariable)) { + // Best effort, no need to fail if we can't set the logging path. StrAllocFormatted(&pPackage->sczLogPathVariable, L"WixBundleLog_%ls", pPackage->sczId); } else if (fRollback && (!pPackage->sczRollbackLogPathVariable || !*pPackage->sczRollbackLogPathVariable)) { + // Best effort, no need to fail if we can't set the logging path. StrAllocFormatted(&pPackage->sczRollbackLogPathVariable, L"WixBundleRollbackLog_%ls", pPackage->sczId); } } @@ -1052,7 +1054,8 @@ static HRESULT GetNonSessionSpecificTempFolder( hr = ::StringCchLengthW(sczSessionId, STRSAFE_MAX_CCH, reinterpret_cast(&cchSessionId)); ExitOnFailure(hr, "Failed to get length of session id string."); - if (CSTR_EQUAL == ::CompareStringOrdinal(sczTempFolder + cchTempFolder - cchSessionId, static_cast(cchSessionId), sczSessionId, static_cast(cchSessionId), FALSE)) + if (cchTempFolder >= cchSessionId && + CSTR_EQUAL == ::CompareStringOrdinal(sczTempFolder + cchTempFolder - cchSessionId, static_cast(cchSessionId), sczSessionId, static_cast(cchSessionId), FALSE)) { cchTempFolder -= cchSessionId; } -- cgit v1.2.3-55-g6feb