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

memory: More lenient hex dump output matching #92

Merged
merged 1 commit into from
Feb 10, 2022
Merged

Conversation

jynik
Copy link
Collaborator

@jynik jynik commented Feb 9, 2022

The following was observed on a device running (a fork of) U-Boot 2012.10
when a small (word-wise) memory read was performed when validating an
applied MemoryPatch:

depthcharge.operation.OperationFailed:
    Failed to parse line: bff64d92: f7ff ffd5    ....

This failure arises from our regular expression expecting 16 characters
in the ASCII section of the hex dump output, which clearly is not the
case here. (It seems newer versions pad up to a fixed line length.)

We now look for 1 to 16 characters. I don't recall U-Boot ever
outputting an address followed by an empty line, hence not {0, 16}.

Fixes #91

The following was observed on a device running (a fork of) U-Boot 2012.10
when a small (word-wise) memory read was performed when validating an
applied MemoryPatch:

    depthcharge.operation.OperationFailed:
        Failed to parse line: bff64d92: f7ff ffd5    ....

This failure arises from our regular expression expecting 16 characters
in the ASCII section of the hex dump output, which clearly is not the
case here. (It seems newer versions pad up to a fixed line length.)

We now look for 1 to 16 characters. I don't recall U-Boot ever
outputting an address followed by an empty line, hence not {0, 16}.

Fixes nccgroup#91
@jynik jynik merged commit a8aa306 into nccgroup:next Feb 10, 2022
@jynik jynik deleted the issue-91 branch February 10, 2022 04:55
This pull request was closed.
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.

1 participant