Skip to content

Conversation

@andremralves
Copy link
Contributor

@andremralves andremralves commented Mar 25, 2024

This commit also fixes the same problem for aes_encrypt().

  • The Jira issue number for this PR is: MDEV-33659

Description

  • When there is no parameter item_list is NULL.
  • This code checks if item_list is NULL before setting arg_count to item_list->elements.

Release Notes

Fix system crash when aes_encrypt() and aes_decrypt() where called without parameters.

How can this PR be tested?

./mtr main.func_str

Basing the PR against the correct MariaDB version

  • This is a new feature and the PR is based against the latest MariaDB development branch.
  • This is a bug fix and the PR is based against the earliest maintained branch in which the bug can be reproduced.

PR quality check

  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

Copy link
Member

@grooverdan grooverdan left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Can you rebase to 11.2, edit the title here and change the target branch to 11.2, and force push your branch after changing the test "End of 11.5" messages and putting at the right location in the test file.

--echo #

--echo #
--echo # Test kdf() without parameters
Copy link
Member

Choose a reason for hiding this comment

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

Last request - put the MDEV number at the beginning of the echo - same with other tests.

@andremralves
Copy link
Contributor Author

andremralves commented Mar 25, 2024

Looks good to me.

Can you rebase to 11.2, edit the title here and change the target branch to 11.2, and force push your branch after changing the test "End of 11.5" messages and putting at the right location in the test file.

I noticed that kdf() function was not implemented in 11.2. Should I make 2 PRs? One for aes functions starting from 11.2 and the other for kdf() starting from 11.3 (when kdf() got implementd)?

@grooverdan
Copy link
Member

yep, 2 prs. Fine to reference the same MDEV

@CLAassistant
Copy link

CLAassistant commented Mar 25, 2024

CLA assistant check
All committers have signed the CLA.

@andremralves andremralves changed the base branch from 11.5 to 11.2 March 25, 2024 17:03
@andremralves
Copy link
Contributor Author

Hi @grooverdan, I made the changes and created another PR for KDF: #3153

Copy link
Member

@grooverdan grooverdan left a comment

Choose a reason for hiding this comment

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

thank you

Copy link
Contributor

@LinuxJedi LinuxJedi left a comment

Choose a reason for hiding this comment

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

Excellent! Many thanks!

@LinuxJedi LinuxJedi enabled auto-merge (rebase) April 11, 2024 12:47
@LinuxJedi LinuxJedi merged commit 4a35a3b into MariaDB:11.2 Apr 11, 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.

4 participants