Skip to content

Fix vuln OSV-2024-793 #3

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

Open
oss-patch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix vuln OSV-2024-793 #3

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
16 changes: 16 additions & 0 deletions src/mat73.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3319,6 +3319,16 @@ Mat_CalcDir73(mat_t *mat, size_t *n)
if ( NULL == mat || NULL == n )
return MATIO_E_BAD_ARGUMENT;

if ( mat->num_datasets == 0 ) {
Mat_Critical("Number of datasets is zero");
return MATIO_E_BAD_ARGUMENT;
}

if ( mat->fp == NULL ) {
Mat_Critical("Invalid file pointer");
return MATIO_E_BAD_ARGUMENT;
}

*n = 0;
mat->dir = (char **)calloc(mat->num_datasets, sizeof(char *));
if ( NULL == mat->dir ) {
Expand All @@ -3331,6 +3341,11 @@ Mat_CalcDir73(mat_t *mat, size_t *n)
ssize_t name_len = H5Lget_name_by_idx(*(hid_t *)mat->fp, "/", H5_INDEX_NAME, H5_ITER_INC, i,
NULL, 0, H5P_DEFAULT);
if ( name_len < 1 ) {
Mat_Critical("Invalid name length returned by H5Lget_name_by_idx");
for ( hsize_t j = 0; j < i; j++ ) {
free(mat->dir[j]);
}
free(mat->dir);
return MATIO_E_FAIL_TO_IDENTIFY;
}
name = (char *)malloc(name_len + 1);
Expand All @@ -3347,6 +3362,7 @@ Mat_CalcDir73(mat_t *mat, size_t *n)
(*n)++;
} else {
free(name);
free(name);
}
}
return MATIO_E_NO_ERROR;
Expand Down