8000 gh-127740: For odd-length input to bytes.fromhex(...) change the error message to ValueError: fromhex() arg must be of even length by srinivasreddy · Pull Request #127756 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-127740: For odd-length input to bytes.fromhex(...) change th 8000 e error message to ValueError: fromhex() arg must be of even length #127756

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

Merged
merged 23 commits into from
Dec 11, 2024
Merged

gh-127740: For odd-length input to bytes.fromhex(...) change the error message to ValueError: fromhex() arg must be of even length #127756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b5b0da7
gh-127740: For odd-length input to bytes.fromhex(...) change the erro…
srinivasreddy Dec 9, 2024
14b7d5e
Introduce space between variables
srinivasreddy Dec 9, 2024
f3bfe85
gh-127740: Improve code, consolidate two variables into one
srinivasreddy Dec 9, 2024
5a55e24
Check the logic inside of the loop, instead of checking eagerly
srinivasreddy Dec 9, 2024
a3ba0e7
Remove dead variable
srinivasreddy Dec 9, 2024
ee7947a
Fix a bug in logic
srinivasreddy Dec 9, 2024
879994e
Add some more tests
srinivasreddy Dec 9, 2024
ad96b89
Improve tests
srinivasreddy Dec 9, 2024
95744bd
Revert the change that is not necessary
srinivasreddy Dec 9, 2024
6929a4d
Move everthing to error labels
srinivasreddy Dec 9, 2024
aa6684b
Remove comments
srinivasreddy Dec 9, 2024
bf3ace9
Add tests and update logic
srinivasreddy Dec 9, 2024
3588d18
Update tests
srinivasreddy Dec 9, 2024
504f4ed
Add tests and update logic
srinivasreddy Dec 9, 2024
7bab683
Change the invalid_char value to -1
srinivasreddy Dec 9, 2024
7c819c1
Update test case
srinivasreddy Dec 9, 2024
862bfd5
gh-127740: Improve error messages as suggested by @hauntsaninja
srinivasreddy Dec 10, 2024
6cc9305
Update test cases
8000 srinivasreddy Dec 10, 2024
c34696e
gh-127740: NULL at the end is mapped to 37
srinivasreddy Dec 10, 2024
82762db
gh-127740: Reintroduce the space back
srinivasreddy Dec 10, 2024
6628ea7
gh-127740: Check if we had a second digit
srinivasreddy Dec 10, 2024
b20e248
Add News entry
srinivasreddy Dec 10, 2024
cbf50b4
Fix lint
srinivasreddy Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Lib/test/test_bytes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,12 @@ def test_fromhex(self):
self.assertRaises(ValueError, self.type2test.fromhex, '\x00')
self.assertRaises(ValueError, self.type2test.fromhex, '12 \x00 34')

# For odd number of character(s)
for value in ("a", "aaa", "deadbee"):
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: would be nice to have a test case where the string is of even length, e.g. " aaa" and test cases where we check the error message for " aa a " / " aa a a "

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry for going ahead and merging @hauntsaninja. I should have waited for more input from you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#127818

Copy link
Contributor

Choose a reason for hiding this comment

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

oh all good, was just a nit and commits are cheap :-) thanks for reviewing!

with self.assertRaises(ValueError) as cm:
self.type2test.fromhex(value)
self.assertIn("fromhex() arg must contain an even number of hexadecimal digits", str(cm.exception))

for data, pos in (
# invalid first hexadecimal character
('12 x4 56', 3),
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2024-12-10-21-08-05.gh-issue-127740.0tWC9h.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix error message in :func:`bytes.fromhex` when given an odd number of
digits to properly indicate that an even number of hexadecimal digits is
required.
18 changes: 14 additions & 4 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2543,7 +2543,12 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)

bot = _PyLong_DigitValue[*str];
if (bot >= 16) {
invalid_char = str - PyUnicode_1BYTE_DATA(string);
/* Check if we had a second digit */
if (str >= end){
invalid_char = -1;
} else {
invalid_char = str - PyUnicode_1BYTE_DATA(string);
}
goto error;
}
str++;
Expand All @@ -2554,9 +2559,14 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)
return _PyBytesWriter_Finish(&writer, buf);

error:
PyErr_Format(PyExc_ValueError,
"non-hexadecimal number found in "
"fromhex() arg at position %zd", invalid_char);
if (invalid_char == -1) {
PyErr_SetString(PyExc_ValueError,
"fromhex() arg must contain an even number of hexadecimal digits");
} else {
PyErr_Format(PyExc_ValueError,
"non-hexadecimal number found in "
"fromhex() arg at position %zd", invalid_char);
}
_PyBytesWriter_Dealloc(&writer);
return NULL;
}
Expand Down
Loading
0