Skip to content

add a check to prevent an array out of bounds error #2571

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
gforney merged 5 commits into from
Apr 2, 2026
Merged

add a check to prevent an array out of bounds error #2571

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b90dba
smokeview source: add pp_PATCH_DEBUG
gforney Apr 2, 2026
90f05af
smokeview source: add a check to prevent an array out of bounds error
gforney Apr 2, 2026
169946a
Merge remote-tracking branch 'origin/master' into issue2565
gforney Apr 2, 2026
22573f5
smokeview source: fix typo
gforney Apr 2, 2026
2720d1e
smokeview source: check for a NULL pointer before using
gforney Apr 2, 2026
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
19 changes: 15 additions & 4 deletions Source/smokeview/IOboundary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,18 +971,26 @@ void GetPatchSizes1(FILE_m **stream, const char *patchfilename, unsigned char *b
}

// ! ------------------ GetPatchSizes2 ------------------------

//#define pp_PATCH_DEBUG
void GetPatchSizes2(FILE_m *stream, int npatch, int nmeshes_arg, int *npatchsize, patchfacedata *patchfaceinfo, int *headersize, int *framesize){
int ijkp[9] = {0};

*npatchsize = 0;

int n;
#ifdef pp_PATCH_DEBUG
FILE *fstream = fopen("patches.csv", "w");
if(fstream!=NULL)fprintf(fstream,"patch index,i1,i2,j1,j2,k1,k2,dir,obst_index,mesh_index\n");
#endif
for(n = 0; n < npatch; n++){
patchfacedata *pfi;
int obst_index, mesh_index;

fseek_m(stream, 4, SEEK_CUR); fread_m(ijkp, sizeof(*ijkp), 9, stream); fseek_m(stream, 4, SEEK_CUR);
#ifdef pp_PATCH_DEBUG
if(fstream!=NULL)fprintf(fstream,"%i,%i, %i, %i, %i, %i, %i, %i, %i, %i\n",
n + 1, ijkp[0], ijkp[1], ijkp[2], ijkp[3], ijkp[4], ijkp[5], ijkp[6], ijkp[7], ijkp[8]);
#endif
pfi = patchfaceinfo + n;
memcpy(pfi->ib, ijkp, 6 * sizeof(int));
pfi->dir = ijkp[6];
Expand All @@ -1006,6 +1014,9 @@ void GetPatchSizes2(FILE_m *stream, int npatch, int nmeshes_arg, int *npatchsize
*headersize += npatch * 4;
*framesize = 8 + 4 + 8 * npatch + (*npatchsize) * 4;

#ifdef pp_PATCH_DEBUG
if(fstream!=NULL)fclose(fstream);
#endif
return;
}
/* ------------------ DrawFace ------------------------ */
Expand Down Expand Up @@ -3222,7 +3233,7 @@ void DrawBoundaryCellCenter(const meshdata *meshi){
if(pfi->type==INTERIORwall)drawit = 1;
if(pfi->obst == NULL && pfi->internal_mesh_face==1)drawit = 0;
#ifdef pp_BNDF_DEBUG
if(bndf_vis_patch[n] == 0)drawit = 0;
if(n < NPATCHES_DEBUG && bndf_vis_patch[n] == 0)drawit = 0;
#endif
if(drawit==1){
nrow = pfi->nrow;
Expand Down Expand Up @@ -3304,7 +3315,7 @@ void DrawBoundaryCellCenter(const meshdata *meshi){
}
}
#ifdef pp_BNDF_DEBUG
if(bndf_vis_patch[n] == 0)drawit = 0;
if(n<NPATCHES_DEBUG && bndf_vis_patch[n] == 0)drawit = 0;
#endif
if(pfi->obst == NULL && pfi->internal_mesh_face==1)drawit = 0;
if(drawit==1){
Expand Down Expand Up @@ -3381,7 +3392,7 @@ void DrawBoundaryCellCenter(const meshdata *meshi){
}
if(pfi->obst == NULL && pfi->internal_mesh_face==1)drawit = 0;
#ifdef pp_BNDF_DEBUG
if(bndf_vis_patch[n] == 0)drawit = 0;
if(n < NPATCHES_DEBUG && bndf_vis_patch[n] == 0)drawit = 0;
#endif
if(drawit==1){
nrow = pfi->nrow;
Expand Down
Loading