[Backport 3.10] QgsExpression::referencedAttributeIndexes(): only report valid indices #33958
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the expression was referencing a non-existing field, -1 was returned in the result set, which caused later crashed in various providers, including the Spatialite, Postgres, etc..., due to tried to dereference mFields.at(-1) Discarding invalid indices is what is also done in QgsFeatureRequest::OrderBy::usedAttributeIndices() Fixes qgis#33878
…s to non existing fields in filter expression and order by
…ust to references to non existing fields in filter expression
rouault
added
Backport
m-kuhn
reviewed
Jan 21, 2020
| if ( !mAttributeList.contains( attrIdx ) ) | ||
| mAttributeList << attrIdx; | ||
| } | ||
| } | ||
|
|
||
| // ensure that all attributes required for order by are fetched | ||
| const QSet< QString > orderByAttributes = mRequest.orderBy().usedAttributes(); | ||
| for ( const QString &attr : orderByAttributes ) | ||
| const auto orderByAttributes = mRequest.orderBy().usedAttributeIndices( mSource->mFields ); |
There was a problem hiding this comment.
Interesting choice to switch from auto to explicit on line 73 and from explicit to auto here.
m-kuhn
approved these changes
Jan 21, 2020
m-kuhn
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #33927
If the expression was referencing a non-existing field, -1 was returned in the
result set, which caused later crashed in various providers, including the
Spatialite, Postgres, etc..., due to tried to dereference mFields.at(-1)
Discarding invalid indices is what is also done in
QgsFeatureRequest::OrderBy::usedAttributeIndices()
Fixes #33878