[tbb-commits] [tor-browser/tor-browser-68.3.0esr-9.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.

[gk at torproject.org]

commit acaf32506a39f94751853ff55869855ac3563a54
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Nov 26 15:12:59 2019 -0500

    squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
    
    Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.
---
 toolkit/mozapps/update/common/updatehelper.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp
index 893a507a5c61..e9ee4886dea2 100644
--- a/toolkit/mozapps/update/common/updatehelper.cpp
+++ b/toolkit/mozapps/update/common/updatehelper.cpp
@@ -62,6 +62,13 @@ BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath,
  * @return TRUE if successful
  */
 BOOL GetSecureOutputDirectoryPath(LPWSTR outBuf) {
+#ifdef TOR_BROWSER_UPDATE
+  // This function is used to support the maintenance service and elevated
+  // updates and is therefore not called by Tor Browser's updater. We stub
+  // it out to avoid any chance that the Tor Browser updater will create
+  // files under C:\Program Files (x86)\ or a similar location.
+  return FALSE;
+#else
   PWSTR progFilesX86;
   if (FAILED(SHGetKnownFolderPath(FOLDERID_ProgramFilesX86, KF_FLAG_CREATE,
                                   nullptr, &progFilesX86))) {
@@ -95,6 +102,7 @@ BOOL GetSecureOutputDirectoryPath(LPWSTR outBuf) {
   }
 
   return TRUE;
+#endif
 }
 
 /**