Skip to content

fix strings type hints and bugs #1103

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

0xRavenspar
Copy link

@0xRavenspar 0xRavenspar commented Mar 24, 2025

Implements the changes made in mandiant/capa#2555 to floss/strings.py.

Changes made:

  • Added type hints
  • fixed the strings.py helpers
  • consolidated the tests into a single file
  • Added extra test cases to check for usage

Please do let me know if the tests are alright and if i need to make any changes

Closes #1094

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Hello @0xRavenspar, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

This pull request addresses improvements to the floss/strings.py file, focusing on enhancing code clarity, maintainability, and robustness. The changes include the addition of type hints, bug fixes in the helper functions, consolidation of tests into a single file (tests/test_strings.py), and the addition of new test cases to improve code coverage. The pull request description indicates that these changes are based on a related pull request in another repository.

Highlights

  • Type Hinting: Added type hints to functions in floss/strings.py to improve code readability and maintainability.
  • Bug Fixes: Corrected issues within the helper functions in floss/strings.py, specifically addressing the buf_filled_with function to ensure accurate checks for buffers filled with repeating characters.
  • Test Consolidation and Expansion: Consolidated all tests into a single file (tests/test_strings.py) and added new test cases to cover various scenarios, including edge cases and mmap usage, enhancing the reliability of the floss/strings.py module.
  • Input Validation: Added input validation to extract_ascii_strings and extract_unicode_strings to raise a ValueError if the minimum string length n is not a positive integer.

Changelog

Click here to see the changelog
  • floss/strings.py
    • Added type hints to function signatures.
    • Improved the buf_filled_with function to correctly handle buffers of various sizes and edge cases, including empty buffers.
    • Added a check in buf_filled_with to raise a ValueError if the character value is outside the valid byte range (0-255).
    • Added input validation to extract_ascii_strings and extract_unicode_strings to ensure the minimum string length is positive.
    • Updated docstrings to use 'Params' instead of ':param' and ':type' for parameter descriptions.
    • Removed redundant return statements when the input buffer is empty.
  • tests/test_buf_filled_with.py
    • Removed this file as tests were consolidated into tests/test_strings.py.
  • tests/test_strings.py
    • Consolidated tests from tests/test_buf_filled_with.py into this file.
    • Added comprehensive test cases for buf_filled_with, including tests for single repeating bytes, mixed bytes, edge cases (empty buffer, single byte), large buffers, and mmap usage.
    • Added tests for extract_ascii_strings covering empty buffers, basic ASCII extraction, minimum length constraints, non-ASCII characters, buffers with only non-ASCII characters, and skipping repeated bytes.
    • Added tests for extract_unicode_strings covering basic UTF-16LE extraction, minimum length constraints, invalid UTF-16LE sequences, and skipping repeated bytes.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.


Did you know?

The term 'Unicode' is derived from the goals of the Unicode Consortium to provide a 'universal, uniform, and unique' character encoding.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request addresses type hints and bug fixes in the floss/strings.py file, consolidates tests, and adds new test cases. The changes look good overall, with improvements in code clarity and test coverage.

Summary of Findings

  • Input Validation: The buf_filled_with function validates the character input to ensure it's within the byte range (0-255). This is good for preventing unexpected behavior. The extract_ascii_strings and extract_unicode_strings functions validate that the minimum string length n is positive, raising a ValueError if it's not. This is important for preventing errors and ensuring the functions behave as expected.
  • Test Coverage: The tests have been consolidated into a single file and expanded with additional test cases, which improves the overall test coverage and reliability of the strings.py module.
  • Code Clarity: The addition of type hints enhances code readability and maintainability. The docstrings for the functions have been updated to provide clear explanations of the arguments and return values.

Merge Readiness

The pull request is in good shape and addresses the issues outlined in the original issue. The code is more robust with the added input validation and has improved test coverage. I am unable to directly approve this pull request, and recommend that others review and approve this code before merging.

Copy link
Collaborator

@williballenthin williballenthin left a comment

Choose a reason for hiding this comment

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

thanks @0xRavenspar!

Copy link
Collaborator

@mr-tz mr-tz left a comment

Choose a reason for hiding this comment

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

Looks good besides one question.

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.

Double check strings algorithm
3 participants