Skip to content

detect/integers: harmonize parser return handling (backport7)#11514

Closed
catenacyber wants to merge 1 commit intoOISF:main-7.0.xfrom
catenacyber:detect-int-free-7172-backport7
Closed

detect/integers: harmonize parser return handling (backport7)#11514
catenacyber wants to merge 1 commit intoOISF:main-7.0.xfrom
catenacyber:detect-int-free-7172-backport7

Conversation

@catenacyber
Copy link
Contributor

Link to ticket: https://redmine.openinfosecfoundation.org/issues/
https://redmine.openinfosecfoundation.org/issues/7173

Describe changes:

        both modified:   src/detect-bsize.c
        both modified:   src/detect-filesize.c
        both modified:   src/detect-icode.c
        both modified:   src/detect-itype.c

Conflicts easy to fix manually

Ticket: 7172

When parsing an integer for a rule keyword fails, we return error
straight away, without bothering to try to free the NULL pointer.

On the way, remove some one-line wrapper around DetectUxParse

(cherry picked from commit daad7f2)
@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 21578

@inashivb inashivb self-requested a review July 17, 2024 05:51
Copy link
Member

@inashivb inashivb left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

This was referenced Aug 6, 2024
@victorjulien
Copy link
Member

Merged in #11613, thanks!

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.

4 participants