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

Fix some static analysis minor defects #2569

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix some static analysis minor defects #2569

wants to merge 1 commit into from

Conversation

vrabaud
Copy link
Collaborator

@vrabaud vrabaud commented Jan 13, 2025

  • fix comparison of uint64_t with SIZE_MAX for platforms where uint64_t and size_t are different
  • do not compare two floats for equality

@vrabaud
Fix some static analysis minor defects
53dc07c 
- fix comparison of uint64_t with SIZE_MAX for platforms where
  uint64_t and size_t are different
- do not compare two floats for equality
@vrabaud vrabaud requested a review from wantehchang January 13, 2025 10:28
@vrabaud vrabaud marked this pull request as ready for review January 13, 2025 10:28
wantehchang
wantehchang approved these changes Jan 13, 2025
View reviewed changes
Copy link
Collaborator

@wantehchang wantehchang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fixes. I suggest a change to the UINT64_MAX != SIZE_MAX tests.

src/read.c
@@ -1138,9 +1138,11 @@ static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const a

outExtent->offset = minOffset;
const uint64_t extentLength = maxOffset - minOffset;
#if UINT64_MAX != SIZE_MAX
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Let's use > in these tests:

#if UINT64_MAX > SIZE_MAX

This excludes the unlikely case of UINT64_MAX < SIZE_MAX.

src/gainmap.c
@@ -45,12 +45,13 @@ static float avifGetGainMapWeight(float hdrHeadroom, const avifGainMap * gainMap
{
const float baseHdrHeadroom = avifUnsignedFractionToFloat(gainMap->baseHdrHeadroom);
const float alternateHdrHeadroom = avifUnsignedFractionToFloat(gainMap->alternateHdrHeadroom);
if (baseHdrHeadroom == alternateHdrHeadroom) {
const float diffHdrHeadroom = alternateHdrHeadroom - baseHdrHeadroom;
if (diffHdrHeadroom == 0.f) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: 0.f => 0.0f

See https://google.github.io/styleguide/cppguide.html#Floating_Literals

src/gainmap.c
// Do not apply the gain map if the HDR headroom is the same.
// This case is not handled in the specification and does not make practical sense.
return 0.0f;
}
const float w = AVIF_CLAMP((hdrHeadroom - baseHdrHeadroom) / (alternateHdrHeadroom - baseHdrHeadroom), 0.0f, 1.0f);
const float w = AVIF_CLAMP((hdrHeadroom - baseHdrHeadroom) / diffHdrHeadroom, 0.0f, 1.0f);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this Coverity defect (464731 Division or modulo by float zero) is a Coverity bug. We don't need to change our code for a Coverity bug if the current code is clearer. We can classify the Coverity defect as a false positive and ignore it in the Coverity UI.

Have you verified (with a Coverity analysis) that this change fixes the Coverity defect?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wantehchang wantehchang wantehchang approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vrabaud @wantehchang