StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Replace usage of deprecated functions within Sandboxed API

Browse Source 
PiperOrigin-RevId: 363637782
Change-Id: I804d60fb3990f891416f06d36cb71b094daf3e37
This commit is contained in:
Christian Blichmann 2021-03-18 05:39:27 -07:00 committed by Copybara-Service
parent 753eacd314
commit 03bf9f72c0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandboxed_api/examples/sum/lib/BUILD.bazel
View File

@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
licenses(["notice"])
load("//sandboxed_api/bazel:build_defs.bzl", "sapi_platform_copts") load("//sandboxed_api/bazel:build_defs.bzl", "sapi_platform_copts")
load("//sandboxed_api/bazel:proto.bzl", "sapi_proto_library") load("//sandboxed_api/bazel:proto.bzl", "sapi_proto_library")
load("//sandboxed_api/bazel:sapi.bzl", "sapi_library") load("//sandboxed_api/bazel:sapi.bzl", "sapi_library")
licenses(["notice"])
sapi_proto_library( sapi_proto_library(
name = "sum_params_proto", name = "sum_params_proto",
srcs = ["sum_params.proto"], srcs = ["sum_params.proto"],

16
sandboxed_api/sandbox.cc
View File

@ -220,14 +220,14 @@ absl::Status Sandbox::Allocate(v::Var* var, bool automatic_free) {
if (!is_active()) { if (!is_active()) {
return absl::UnavailableError("Sandbox not active"); return absl::UnavailableError("Sandbox not active");
} }
return var->Allocate(GetRpcChannel(), automatic_free); return var->Allocate(rpc_channel(), automatic_free);
} }
absl::Status Sandbox::Free(v::Var* var) { absl::Status Sandbox::Free(v::Var* var) {
if (!is_active()) { if (!is_active()) {
return absl::UnavailableError("Sandbox not active"); return absl::UnavailableError("Sandbox not active");
} }
return var->Free(GetRpcChannel()); return var->Free(rpc_channel());
} }
absl::Status Sandbox::SynchronizePtrBefore(v::Callable* ptr) { absl::Status Sandbox::SynchronizePtrBefore(v::Callable* ptr) {
@ -259,7 +259,7 @@ absl::Status Sandbox::SynchronizePtrBefore(v::Callable* ptr) {
VLOG(3) << "Synchronization (TO), ptr " << p << ", Type: " << p->GetSyncType() VLOG(3) << "Synchronization (TO), ptr " << p << ", Type: " << p->GetSyncType()
<< " for var: " << p->GetPointedVar()->ToString(); << " for var: " << p->GetPointedVar()->ToString();
return p->GetPointedVar()->TransferToSandboxee(GetRpcChannel(), pid()); return p->GetPointedVar()->TransferToSandboxee(rpc_channel(), pid());
} }
absl::Status Sandbox::SynchronizePtrAfter(v::Callable* ptr) const { absl::Status Sandbox::SynchronizePtrAfter(v::Callable* ptr) const {
@ -287,7 +287,7 @@ absl::Status Sandbox::SynchronizePtrAfter(v::Callable* ptr) const {
p->ToString())); p->ToString()));
} }
return p->GetPointedVar()->TransferFromSandboxee(GetRpcChannel(), pid()); return p->GetPointedVar()->TransferFromSandboxee(rpc_channel(), pid());
} }
absl::Status Sandbox::Call(const std::string& func, v::Callable* ret, absl::Status Sandbox::Call(const std::string& func, v::Callable* ret,
@ -347,7 +347,7 @@ absl::Status Sandbox::Call(const std::string& func, v::Callable* ret,
// Call & receive data. // Call & receive data.
FuncRet fret; FuncRet fret;
SAPI_RETURN_IF_ERROR( SAPI_RETURN_IF_ERROR(
GetRpcChannel()->Call(rfcall, comms::kMsgCall, &fret, rfcall.ret_type)); rpc_channel()->Call(rfcall, comms::kMsgCall, &fret, rfcall.ret_type));
if (fret.ret_type == v::Type::kFloat) { if (fret.ret_type == v::Type::kFloat) {
ret->SetDataFromPtr(&fret.float_val, sizeof(fret.float_val)); ret->SetDataFromPtr(&fret.float_val, sizeof(fret.float_val));
@ -381,14 +381,14 @@ absl::Status Sandbox::TransferToSandboxee(v::Var* var) {
if (!is_active()) { if (!is_active()) {
return absl::UnavailableError("Sandbox not active"); return absl::UnavailableError("Sandbox not active");
} }
return var->TransferToSandboxee(GetRpcChannel(), pid()); return var->TransferToSandboxee(rpc_channel(), pid());
} }
absl::Status Sandbox::TransferFromSandboxee(v::Var* var) { absl::Status Sandbox::TransferFromSandboxee(v::Var* var) {
if (!is_active()) { if (!is_active()) {
return absl::UnavailableError("Sandbox not active"); return absl::UnavailableError("Sandbox not active");
} }
return var->TransferFromSandboxee(GetRpcChannel(), pid()); return var->TransferFromSandboxee(rpc_channel(), pid());
} }
absl::StatusOr<std::string> Sandbox::GetCString(const v::RemotePtr& str, absl::StatusOr<std::string> Sandbox::GetCString(const v::RemotePtr& str,
@ -397,7 +397,7 @@ absl::StatusOr<std::string> Sandbox::GetCString(const v::RemotePtr& str,
return absl::UnavailableError("Sandbox not active"); return absl::UnavailableError("Sandbox not active");
} }
SAPI_ASSIGN_OR_RETURN(auto len, GetRpcChannel()->Strlen(str.GetValue())); SAPI_ASSIGN_OR_RETURN(auto len, rpc_channel()->Strlen(str.GetValue()));
if (len > max_length) { if (len > max_length) {
return absl::InvalidArgumentError( return absl::InvalidArgumentError(
absl::StrCat("Target string too large: ", len, " > ", max_length)); absl::StrCat("Target string too large: ", len, " > ", max_length));