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

chore: cherry-pick 88f6139ead from sqlite #35560

Merged
merged 2 commits into from Sep 13, 2022

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Sep 1, 2022

Author: Ayu Ishii ayui@chromium.org
Date: Fri Jul 15 13:20:47 2022 +0000

When applying the omit-ORDER-BY optimization, defer deleting the AST of
the deleted ORDER BY clause until after code generation ends.


FossilOrigin-Name: b88d6c4b814ec4166ec50f32a2f10d7857df05414c0048c1234ab290a273e50c
(cherry picked from commit 9dde91f61386e4fc53eb95b6cbd26bf30521225f)
Bug: 1343348
Change-Id: Id677f72166c00a05f95c25438230f4b1d40f4d4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/sqlite/+/3764026
Reviewed-by: Austin Sullivan <asully@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>

Notes: Security: backported fix for CVE-2022-3039.

@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 20-x-y labels Sep 1, 2022
@ppontes ppontes requested review from a team as code owners September 1, 2022 20:28
Copy link
Member

@codebytere codebytere left a comment

Choose a reason for hiding this comment

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

Lint failing with whitespace errors

Copy link
Member

@codebytere codebytere left a comment

Choose a reason for hiding this comment

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

ignore this, github duplicated it seems

@ppontes ppontes force-pushed the cherry-pick/20-x-y/sqlite/88f6139ead branch from 2d4903c to 2c9d717 Compare September 7, 2022 13:05
@ppontes
Copy link
Member Author

ppontes commented Sep 7, 2022

Lint failing with whitespace errors

Thanks, this has been fixed.

@ppontes ppontes force-pushed the cherry-pick/20-x-y/sqlite/88f6139ead branch from 5ab4999 to 7fa9c8c Compare September 7, 2022 21:33
@ppontes ppontes force-pushed the cherry-pick/20-x-y/sqlite/88f6139ead branch from b99d187 to 7c0e242 Compare September 9, 2022 09:43
@codebytere codebytere merged commit 604034a into 20-x-y Sep 13, 2022
@codebytere codebytere deleted the cherry-pick/20-x-y/sqlite/88f6139ead branch September 13, 2022 21:34
@release-clerk
Copy link

release-clerk bot commented Sep 13, 2022

Release Notes Persisted

Security: backported fix for CVE-2022-3039.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
20-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants