mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: resolve symlinks when computing relative asar paths for integrity (#34776)

Browse source
This commit is contained in:
Samuel Attard 2022-06-28 16:02:00 -07:00 committed by GitHub
parent 07294cbf15
commit 44b9ee51f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/common/asar/archive_mac.mm
View file

@ -11,6 +11,7 @@
#include <iomanip> #include <iomanip>
#include <string> #include <string>
#include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/mac/bundle_locations.h" #include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h" #include "base/mac/foundation_util.h"
@ -21,7 +22,8 @@
namespace asar { namespace asar {
absl::optional<base::FilePath> Archive::RelativePath() const { absl::optional<base::FilePath> Archive::RelativePath() const {
base::FilePath bundle_path = base::mac::MainBundlePath().Append("Contents"); base::FilePath bundle_path = base::MakeAbsoluteFilePath(
base::mac::MainBundlePath().Append("Contents"));
base::FilePath relative_path; base::FilePath relative_path;
if (!bundle_path.AppendRelativePath(path_, &relative_path)) if (!bundle_path.AppendRelativePath(path_, &relative_path))