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

feat(asm): fix segmentation fault parsing JSON in Python2 (backport #4082) (backport #4094) #4101

Merged
merged 1 commit into from
Aug 16, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2022

This is an automatic backport of pull request #4094 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…4082) (#4094)

* feat(asm): fix segmentation fault parsing JSON in Python2 (#4082)

## Description
Fix Python 2 error reading WAF rules

## Checklist
- [x] Title must conform to [conventional commit](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional).
- [x] Add additional sections for `feat` and `fix` pull requests.
- [x] Ensure tests are passing for affected code.

## Reviewer Checklist
- [ ] Title is accurate.
- [ ] Description motivates each change.
- [ ] No unnecessary changes were introduced in this PR.
- [ ] PR cannot be broken up into smaller PRs.
- [ ] Avoid breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary.
- [ ] Tests provided or description of manual testing performed is included in the code or PR.
- [ ] Release note has been added for fixes and features, or else `changelog/no-changelog` label added.
- [ ] All relevant GitHub issues are correctly linked.
- [ ] Backports are identified and tagged with Mergifyio.
- [ ] Add to milestone.

(cherry picked from commit 399940a)

# Conflicts:
#	tests/appsec/test_processor.py

* feat: resolve cherrypick conflicts

* feat: resolve cherrypick conflicts

Co-authored-by: Alberto Vara <[email protected]>
(cherry picked from commit a75815d)
@avara1986 avara1986 self-requested a review August 16, 2022 15:39
@brettlangdon brettlangdon merged commit b10c8df into 0.61 Aug 16, 2022
@brettlangdon brettlangdon deleted the mergify/bp/0.61/pr-4094 branch August 16, 2022 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants