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.

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

libpromises/evalfunction: Do not crash w/o arguments #5630

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

btriller
Copy link
Contributor

@btriller btriller commented Nov 19, 2024

Do not crash cf-promises if no argument is given for following functions:

  • readfile
  • iprange
  • isipinsubnet

@btriller btriller force-pushed the evalfuntion-crash branch 2 times, most recently from 51f4289 to 8979788 Compare November 20, 2024 07:51
@CLAassistant
Copy link

CLAassistant commented Nov 20, 2024

CLA assistant check
All committers have signed the CLA.

libpromises/evalfunction.c Fixed Show fixed Hide fixed
libpromises/evalfunction.c Fixed Show fixed Hide fixed
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

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

Great, thanks 🚀 You can easily fix the CodeQL alerts by adding

assert(fp != NULL);

in the top of the function block. Let me know if you want me to fix this for you.

In the mean while we can ask @cf-bottom to test this in Jenkins

@olehermanse
Copy link
Member

@cf-bottom jenkins, please

@cf-bottom
Copy link

Do not crash cf-promises if no argument is given for following
functions:
* readfile
* iprange
* isipinsubnet
@olehermanse olehermanse added the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label Nov 26, 2024
@olehermanse
Copy link
Member

@btriller Thank you for your contribution, merging. Your fixes will probably not make it into the releases we're working on now (3.24.1 and 3.21.6), but will be a part of the next ones (3.25.0, 3.24.2, and 3.21.7).

@olehermanse olehermanse merged commit ee1d2a9 into cfengine:master Nov 26, 2024
13 checks passed
@btriller btriller deleted the evalfuntion-crash branch December 13, 2024 12:31
@btriller
Copy link
Contributor Author

@btriller Thank you for your contribution, merging. Your fixes will probably not make it into the releases we're working on now (3.24.1 and 3.21.6), but will be a part of the next ones (3.25.0, 3.24.2, and 3.21.7).

Ping

@larsewi larsewi removed the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants