github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

6543986: Mac: decouple deserializing and applying sandbox policy

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/6543986

The DecodeVarInt and DecodeString functions look benign from a MAS perspective. I suspect they were patched out to avoid "unused function" errors. Their complements for encoding are unpatched, supporting this idea.

The code that uses these functions was refactored out of the section that we patch out. Instead of patching out that new function, I decided to treat it the same as the serialization function that is unpatched.
This commit is contained in:
clavin
2025-06-05 12:57:51 -06:00
committed by John Kleinschmidt
parent 880a670f1a
commit 983de0bc5e
1 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
View File

@@ -1092,7 +1092,7 @@ index 950cf7cfee4e11766dccf5c0bf3f15a8562f0f1e..a5adaaabdbbd91fedbc4cb679c865bc3
// |error| is strerror(errno) when a P* logging function is called. Pass
diff --git a/sandbox/mac/sandbox_serializer.cc b/sandbox/mac/sandbox_serializer.cc
index ea1627bdd872f89056e97e486feb2d44587a894e..95e298393afbe10a168954d887483e5531824c51 100644
index ea1627bdd872f89056e97e486feb2d44587a894e..26f339e40bcbd8963585765e20e49955f49263aa 100644
--- a/sandbox/mac/sandbox_serializer.cc
+++ b/sandbox/mac/sandbox_serializer.cc
@@ -8,6 +8,7 @@
@@ -1103,39 +1103,7 @@ index ea1627bdd872f89056e97e486feb2d44587a894e..95e298393afbe10a168954d887483e55
#include "sandbox/mac/sandbox_logging.h"
#include "sandbox/mac/seatbelt.h"
@@ -32,6 +33,7 @@ void EncodeVarInt(uint64_t from, std::string* into) {
} while (from);
}
+#if !IS_MAS_BUILD()
bool DecodeVarInt(std::string_view* from, uint64_t* into) {
std::string_view::const_iterator it = from->begin();
int shift = 0;
@@ -50,12 +52,12 @@ bool DecodeVarInt(std::string_view* from, uint64_t* into) {
from->remove_prefix(it - from->begin());
return true;
}
-
+#endif
void EncodeString(const std::string& value, std::string* into) {
EncodeVarInt(value.length(), into);
into->append(value);
}
-
+#if !IS_MAS_BUILD()
bool DecodeString(std::string_view* slice, std::string* value) {
uint64_t length;
if (!DecodeVarInt(slice, &length) || length < 0) {
@@ -70,7 +72,7 @@ bool DecodeString(std::string_view* slice, std::string* value) {
slice->remove_prefix(size);
return true;
}
-
+#endif
} // namespace
SandboxSerializer::SandboxSerializer(Target mode) : mode_(mode) {
@@ -197,6 +199,7 @@ SandboxSerializer::DeserializePolicy(const std::string& serialized_policy,
@@ -197,6 +198,7 @@ SandboxSerializer::DeserializePolicy(const std::string& serialized_policy,
// static
bool SandboxSerializer::ApplySerializedPolicy(
const std::string& serialized_policy) {
@@ -1143,7 +1111,7 @@ index ea1627bdd872f89056e97e486feb2d44587a894e..95e298393afbe10a168954d887483e55
std::string error;
std::optional<DeserializedPolicy> deserialized_policy =
DeserializePolicy(serialized_policy, error);
@@ -227,6 +230,9 @@ bool SandboxSerializer::ApplySerializedPolicy(
@@ -227,6 +229,9 @@ bool SandboxSerializer::ApplySerializedPolicy(
break;
}
return true;