Skip to content

Commit

Permalink
Fix validation checks
Browse files Browse the repository at this point in the history
  • Loading branch information
j-mattsson committed Sep 25, 2021
1 parent 39c6366 commit 4abb98f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/refresh/models.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ qerror_t MOD_ValidateMD2(dmd2header_t *header, size_t length)
return Q_ERR_TOO_MANY;

end = header->ofs_tris + sizeof(dmd2triangle_t) * header->num_tris;
if (header->ofs_tris < sizeof(header) || end < header->ofs_tris || end > length)
if (header->ofs_tris < sizeof(*header) || end < header->ofs_tris || end > length)
return Q_ERR_BAD_EXTENT;

// check st
Expand All @@ -167,7 +167,7 @@ qerror_t MOD_ValidateMD2(dmd2header_t *header, size_t length)
return Q_ERR_TOO_MANY;

end = header->ofs_st + sizeof(dmd2stvert_t) * header->num_st;
if (header->ofs_st < sizeof(header) || end < header->ofs_st || end > length)
if (header->ofs_st < sizeof(*header) || end < header->ofs_st || end > length)
return Q_ERR_BAD_EXTENT;

// check xyz and frames
Expand All @@ -185,7 +185,7 @@ qerror_t MOD_ValidateMD2(dmd2header_t *header, size_t length)
return Q_ERR_BAD_EXTENT;

end = header->ofs_frames + (size_t)header->framesize * header->num_frames;
if (header->ofs_frames < sizeof(header) || end < header->ofs_frames || end > length)
if (header->ofs_frames < sizeof(*header) || end < header->ofs_frames || end > length)
return Q_ERR_BAD_EXTENT;

// check skins
Expand All @@ -194,7 +194,7 @@ qerror_t MOD_ValidateMD2(dmd2header_t *header, size_t length)
return Q_ERR_TOO_MANY;

end = header->ofs_skins + (size_t)MD2_MAX_SKINNAME * header->num_skins;
if (header->ofs_skins < sizeof(header) || end < header->ofs_skins || end > length)
if (header->ofs_skins < sizeof(*header) || end < header->ofs_skins || end > length)
return Q_ERR_BAD_EXTENT;
}

Expand Down

0 comments on commit 4abb98f

Please sign in to comment.