Skip to content

Fix crash when disable_positive_acks is enable and the remote reader is best-effort [17338] (backport #3324)#3387

Merged
MiguelCompany merged 1 commit into2.8.xfrom
mergify/bp/2.8.x/pr-3324
Mar 22, 2023
Merged

Fix crash when disable_positive_acks is enable and the remote reader is best-effort [17338] (backport #3324)#3387
MiguelCompany merged 1 commit into2.8.xfrom
mergify/bp/2.8.x/pr-3324

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 17, 2023

This is an automatic backport of pull request #3324 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

…is best-effort (#3324)

* Refs #17332. Add regression test

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #17332. Fix the crash.

Moved block of code before calling flowcontroller::add_new_sample()
avoiding the usage of a removed CacheChange_t pointer.

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
(cherry picked from commit 56f19b0)
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test windows test linux

@Mario-DL Mario-DL added the ci-pending PR which CI is running label Mar 21, 2023
@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Mar 22, 2023
@MiguelCompany MiguelCompany merged commit 7dcac66 into 2.8.x Mar 22, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.8.x/pr-3324 branch March 22, 2023 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants