Skip to content
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

Jump to bottom

osal Integration candidate: Caelum-rc4+dev4 #1226

Merged
merged 9 commits into from
Feb 25, 2022
Merged

osal Integration candidate: Caelum-rc4+dev4 #1226

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49ca8be
Fix #1214, Resolve UT uninitialized variable warnings
skliper Feb 10, 2022
99d6f48
Fix #1216, Remove explicit filename doxygen comments
skliper Feb 17, 2022
7676b89
Fix #1218, Add ut_assert to doxygen and fix warnings
skliper Feb 17, 2022
21cc7f5
Fix #1222, protect if OS_FDGetInfo called on socket
jphickey Feb 23, 2022
603dc13
Merge pull request #1215 from skliper/fix1214-uninit_ut_var
astrogeco Feb 23, 2022
35df49a
Merge pull request #1219 from skliper/fix1218-ut_assert_doxygen
astrogeco Feb 23, 2022
7369007
Merge pull request #1223 from fix-1222-fdgetinfo-socket
astrogeco Feb 23, 2022
b06b98e
Merge pull request #1217 from skliper/fix1216-rm_explicit_filename
astrogeco Feb 24, 2022
776de07
Bump to v6.0.0-rc4+dev42
astrogeco Feb 25, 2022
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
5 changes: 4 additions & 1 deletion src/os/shared/src/osapi-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,10 @@ int32 OS_FDGetInfo(osal_id_t filedes, OS_file_prop_t *fd_prop)
{
record = OS_OBJECT_TABLE_GET(OS_global_stream_table, token);

strncpy(fd_prop->Path, record->name_entry, sizeof(fd_prop->Path) - 1);
if (record->name_entry != NULL)
{
strncpy(fd_prop->Path, record->name_entry, sizeof(fd_prop->Path) - 1);
}
fd_prop->User = record->creator;
fd_prop->IsValid = true;

Expand Down
4 changes: 4 additions & 0 deletions src/unit-test-coverage/shared/src/coveragetest-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,10 @@ void Test_OS_FDGetInfo(void)
OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, &file_prop), OS_SUCCESS);
UtAssert_True(strcmp(file_prop.Path, "ABC") == 0, "file_prop.Path (%s) == ABC", file_prop.Path);

OS_UT_SetupBasicInfoTest(OS_OBJECT_TYPE_OS_STREAM, UT_INDEX_1, NULL, UT_OBJID_OTHER);
OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, &file_prop), OS_SUCCESS);
UtAssert_STRINGBUF_EQ(file_prop.Path, 1, "", 1);

OSAPI_TEST_FUNCTION_RC(OS_FDGetInfo(UT_OBJID_1, NULL), OS_INVALID_POINTER);

UT_SetDefaultReturnValue(UT_KEY(OS_ObjectIdGetById), OS_ERR_INVALID_ID);
Expand Down
2 changes: 1 addition & 1 deletion src/unit-test-coverage/shared/src/os-shared-coverage-support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void OS_UT_SetupBasicInfoTest(osal_objtype_t obj_type, osal_index_t test_idx, co
rptr += test_idx;
memset(rptr, 0, sizeof(*rptr));
rptr->creator = UT_OBJID_OTHER;
rptr->name_entry = "ABC";
rptr->name_entry = name;

OS_UT_SetupTestTargetIndex(obj_type, test_idx);
}