Skip to content

Write & check Base buildid/uuid in pkgimage headers #48836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timholy wants to merge 1 commit into from
Closed

Write & check Base buildid/uuid in pkgimage headers #48836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/staticdata_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,10 @@ static int64_t write_header(ios_t *s, uint8_t pkgimage)
const char *branch = jl_git_branch(), *commit = jl_git_commit();
ios_write(s, branch, strlen(branch)+1);
ios_write(s, commit, strlen(commit)+1);
write_uint64(s, jl_base_module->build_id.hi);
write_uint64(s, jl_base_module->build_id.lo);
write_uint64(s, jl_base_module->uuid.hi);
write_uint64(s, jl_base_module->uuid.lo);
write_uint8(s, pkgimage);
int64_t checksumpos = ios_pos(s);
write_uint64(s, 0); // eventually will hold checksum for the content portion of this (build_id.hi)
Expand Down Expand Up @@ -1170,6 +1174,10 @@ static int readstr_verify(ios_t *s, const char *str, int include_null)
return 1;
}

static int read_uuid_verify(ios_t *s, uint64_t hi, uint64_t lo) {
return read_uint64(s) == hi && read_uint64(s) == lo;
}

JL_DLLEXPORT uint64_t jl_read_verify_header(ios_t *s, uint8_t *pkgimage, int64_t *dataendpos, int64_t *datastartpos)
{
uint16_t bom;
Expand All @@ -1182,7 +1190,9 @@ JL_DLLEXPORT uint64_t jl_read_verify_header(ios_t *s, uint8_t *pkgimage, int64_t
readstr_verify(s, JL_BUILD_ARCH, 1) &&
readstr_verify(s, JULIA_VERSION_STRING, 1) &&
readstr_verify(s, jl_git_branch(), 1) &&
readstr_verify(s, jl_git_commit(), 1))
readstr_verify(s, jl_git_commit(), 1) &&
read_uuid_verify(s, jl_base_module->build_id.hi, jl_base_module->build_id.lo) &&
read_uuid_verify(s, jl_base_module->uuid.hi, jl_base_module->uuid.lo))
{
*pkgimage = read_uint8(s);
checksum = read_uint64(s);
Expand Down