From 90982fbf1c887a3ed3454f9ab3ab8dfbd57a1383 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 26 May 2022 17:34:48 -0500 Subject: Add PathConcatRelativeToBase and use it in Burn. Fixes 6707 --- src/libs/dutil/WixToolset.DUtil/inc/pathutil.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/libs/dutil/WixToolset.DUtil/inc/pathutil.h') diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h index fc6bb3bb..941793f8 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h @@ -236,6 +236,17 @@ DAPI_(HRESULT) PathConcatCch( __deref_out_z LPWSTR* psczCombined ); +/******************************************************************* + PathConcatRelativeToBase - canonicalizes a relative path before + concatenating it to the base path to ensure the resulting path + is inside the base path. +*******************************************************************/ +DAPI_(HRESULT) PathConcatRelativeToBase( + __in LPCWSTR wzBase, + __in_opt LPCWSTR wzRelative, + __deref_out_z LPWSTR* psczCombined + ); + /******************************************************************* PathCompare - compares the fully expanded path of the two paths using ::CompareStringW(). -- cgit v1.2.3-55-g6feb