Skip to content

Conversation

@dilanbhalla
Copy link
Collaborator

@dilanbhalla dilanbhalla commented Sep 18, 2024

Manually resolved conflicts in the following files:

  • cpp/ql/lib/semmle/code/cpp/security/BufferAccess.qll (slight comment change)
  • cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/UnboundedWrite.expected (slightly modified test case output)
  • cpp/ql/test/query-tests/Security/CWE/CWE-119/semmle/tests/tests.cpp (slightly modified test case)
  • csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll (identical, not sure what caused merge conflict)

@dilanbhalla dilanbhalla merged commit 2ee42cb into main Sep 18, 2024
11 checks passed
bdrodes pushed a commit that referenced this pull request Jan 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants