diff options
| author | Mike Frysinger <vapier@google.com> | 2020-09-04 16:20:36 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2020-09-10 05:01:12 -0400 |
| commit | 5f9e3001c61626d2863dad91248ba8496c3ef511 (patch) | |
| tree | d0bdbfd91e45b8562f4940e46da30cbedb911a8e | |
| parent | 0a27ab0f586a3b6d60c7aa4b7750dfb6dc345c9c (diff) | |
| download | platform_external_minijail-5f9e3001c61626d2863dad91248ba8496c3ef511.tar.gz platform_external_minijail-5f9e3001c61626d2863dad91248ba8496c3ef511.tar.bz2 platform_external_minijail-5f9e3001c61626d2863dad91248ba8496c3ef511.zip | |
Unify some simple boilerplate.
Bug: None
Test: `make check` passes
Change-Id: I078c032fb51920a34b20af34d2b6591af16e3053
| -rw-r--r-- | libminijail.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libminijail.c b/libminijail.c index b87de94f..abe5a78b 100644 --- a/libminijail.c +++ b/libminijail.c @@ -1170,6 +1170,11 @@ static void marshal_append(struct marshal_state *state, const void *src, state->total += length; } +static void marshal_append_string(struct marshal_state *state, const char *src) +{ + marshal_append(state, src, strlen(src) + 1); +} + static void marshal_mount(struct marshal_state *state, const struct mountpoint *m) { @@ -1190,15 +1195,15 @@ static void minijail_marshal_helper(struct marshal_state *state, marshal_append(state, (char *)j, sizeof(*j)); if (j->user) - marshal_append(state, j->user, strlen(j->user) + 1); + marshal_append_string(state, j->user); if (j->suppl_gid_list) { marshal_append(state, j->suppl_gid_list, j->suppl_gid_count * sizeof(gid_t)); } if (j->chrootdir) - marshal_append(state, j->chrootdir, strlen(j->chrootdir) + 1); + marshal_append_string(state, j->chrootdir); if (j->hostname) - marshal_append(state, j->hostname, strlen(j->hostname) + 1); + marshal_append_string(state, j->hostname); if (j->alt_syscall_table) { marshal_append(state, j->alt_syscall_table, strlen(j->alt_syscall_table) + 1); @@ -1212,7 +1217,7 @@ static void minijail_marshal_helper(struct marshal_state *state, marshal_mount(state, m); } for (i = 0; i < j->cgroup_count; ++i) - marshal_append(state, j->cgroups[i], strlen(j->cgroups[i]) + 1); + marshal_append_string(state, j->cgroups[i]); } size_t API minijail_size(const struct minijail *j) |