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.

Sign up for GitHub

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

Jump to bottom

Fix include directive not to extract tokens #129

Merged
merged 6 commits into from
Aug 22, 2020
Merged

Fix include directive not to extract tokens #129

merged 6 commits into from
Aug 22, 2020

Conversation

TadeasKucera
Copy link
Contributor

This PR makes sure that YaraFile::textFormatted does not include tokens of included files. We also add a test with first real files.

MatejKastak
MatejKastak approved these changes Aug 20, 2020
View reviewed changes
Copy link
Member

@MatejKastak MatejKastak left a comment

Choose a reason for hiding this comment

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

I was able to test your patch and the problem is not present anymore 👍

  • regarding the code, I left some nitpicks that are up to your consideration

src/types/yara_file.cpp Show resolved Hide resolved
tests/python/test_visitor.py Outdated Show resolved Hide resolved
TadeasKucera and others added 3 commits August 21, 2020 17:01
@TadeasKucera @MatejKastak
Update src/types/yara_file.cpp
57e8c53 
Co-authored-by: MatejKastak <MatejKastak@users.noreply.github.com>
@TadeasKucera @MatejKastak
Add missing new line
604a8ea 
Co-authored-by: MatejKastak <MatejKastak@users.noreply.github.com>
@TadeasKucera
Remove Visitor test which will go to another PR
b605f51
@TadeasKucera
Copy link
Contributor Author

Thank you for your suggestions, I committed both. Also I have removed the test that may be added in separate PR because it is unrelated to this changes.

@TadeasKucera
Copy link
Contributor Author

I believe we can then merge the PR once we pass the checks.

@MatejKastak MatejKastak merged commit 7d0b780 into master Aug 22, 2020
@MatejKastak MatejKastak deleted the fix_include_directive_not_to_extract_tokens branch August 22, 2020 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatejKastak MatejKastak MatejKastak approved these changes

Assignees

@MatejKastak MatejKastak

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TadeasKucera @MatejKastak