Skip to content

Return the proper number of bytes copied when reading box namespaces #184

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

Merged
merged 2 commits into from
Mar 7, 2016
Merged

Return the proper number of bytes copied when reading box namespaces #184

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c38f08
vmpu: Add a halt error to catch unterminated box namespaces
Patater Mar 3, 2016
57de15f
vmpu: Include the terminating-null in the bytes copied count
Patater Mar 3, 2016
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
10 changes: 9 additions & 1 deletion core/system/src/mpu/vmpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,10 +444,18 @@ static int copy_box_namespace(const char *src, char *dst)

if (src[bytes_copied] == '\0') {
/* We've reached the end of the box namespace. */
break;
++bytes_copied; /* Include the terminating-null in bytes_copied. */
goto done;
}
}

/* We did not find a terminating null in the src. The src has been verified
* in vmpu_box_namespace_from_id as being in the box config table. It is a
* programmer error if the namespace in the box config table is not
* null-terminated, so we halt. */
HALT_ERROR(SANITY_CHECK_FAILED, "vmpu: Box namespace missing terminating-null\r\n");

done:
return bytes_copied;
}

Expand Down