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

[NFC][Clang] Fix potential deref of end iterator #70193

Closed
wants to merge 1 commit into from

Conversation

Keenuts
Copy link
Contributor

@Keenuts Keenuts commented Oct 25, 2023

This was found by doing bound-checking on SmallVector iterator usage. When the count is 0, the end iterator is dereferenced to get its address. This doesn't seem to be an issue in practice as most of the time we should be allowed to deref this address, but I don't think this is correct.

This was found by doing bound-checking on SmallVector iterator usage.
When the count is 0, the end iterator is dereferenced to get its
address. This doesn't seem to be an issue in practice as most of the
time, and we are allowed to deref this address, but I don't think
this is correct.

Signed-off-by: Nathan Gauër <brioche@google.com>
@Keenuts
Copy link
Contributor Author

Keenuts commented Oct 26, 2023

CI seems OK, except clang format which complains about an unrelated line. Marking as ready.

@Keenuts Keenuts marked this pull request as ready for review October 26, 2023 09:52
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Oct 26, 2023
@llvmbot
Copy link
Collaborator

llvmbot commented Oct 26, 2023

@llvm/pr-subscribers-clang

Author: Nathan Gauër (Keenuts)

Changes

This was found by doing bound-checking on SmallVector iterator usage. When the count is 0, the end iterator is dereferenced to get its address. This doesn't seem to be an issue in practice as most of the time we should be allowed to deref this address, but I don't think this is correct.


Full diff: https://github.com/llvm/llvm-project/pull/70193.diff

1 Files Affected:

  • (modified) clang/include/clang/Sema/CXXFieldCollector.h (+1-1)
diff --git a/clang/include/clang/Sema/CXXFieldCollector.h b/clang/include/clang/Sema/CXXFieldCollector.h
index f6ecd9f46e5ebdb..ce066581c93fda7 100644
--- a/clang/include/clang/Sema/CXXFieldCollector.h
+++ b/clang/include/clang/Sema/CXXFieldCollector.h
@@ -65,7 +65,7 @@ class CXXFieldCollector {
 
   /// getCurFields - Pointer to array of fields added to the currently parsed
   /// class.
-  FieldDecl **getCurFields() { return &*(Fields.end() - getCurNumFields()); }
+  FieldDecl **getCurFields() { return Fields.end() - getCurNumFields(); }
 
   /// FinishClass - Called by Sema::ActOnFinishCXXClassDef.
   void FinishClass() {

@@ -65,7 +65,7 @@ class CXXFieldCollector {

/// getCurFields - Pointer to array of fields added to the currently parsed
/// class.
FieldDecl **getCurFields() { return &*(Fields.end() - getCurNumFields()); }
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this is basically cwg232 this is ok b/c we are not doing an lvalue-to-rvalue conversion but only using it to take the address of.

CC @zygoloid

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review and linked pointers!
This seems to be the case. and generated code does only the pointer arithmetic, no actual load. Closing this as this is not an issue.

btw, I like your C++ trivia on twitter 😊

@Keenuts Keenuts closed this Nov 13, 2023
@Keenuts Keenuts deleted the fix-dereferencing-end branch November 13, 2023 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:frontend Language frontend issues, e.g. anything involving "Sema" clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants