8000 gh-76961: Fix the PEP3118 format string for ctypes.Structure by eric-wieser · Pull Request #5561 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-76961: Fix the PEP3118 format string for ctypes.Structure #5561

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 10 commits into from
Feb 5, 2023
Merged

gh-76961: Fix the PEP3118 format string for ctypes.Structure #5561

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac4e5bb
bpo-32780: Fix the PEP3118 format string for ctypes.Structure
eric-wieser Feb 6, 2018
e6021e1
Merge branch 'master' into ctypes-padding
eric-wieser Nov 28, 2019
97e9d95
Merge remote-tracking branch 'upstream/main' into ctypes-padding
eric-wieser Jul 7, 2022
6bf5a25
remove unused variable, extend documentation
eric-wieser Jul 8, 2022
3b7f14f
comment
eric-wieser Jul 8, 2022
27b1601
fix incorrect name and documentation
eric-wieser Aug 15, 2022
e300e16
remove the heap allocation as requested
eric-wieser Aug 15, 2022
7e8b4f9
Merge branch 'main' into ctypes-padding
eric-wieser Dec 23, 2022
4de7a8a
Update Misc/NEWS.d/next/Core and Builtins/2018-02-05-21-54-46.bpo-327…
eric-wieser Feb 5, 2023
26311ae
Apply suggestions from code review
eric-wieser Feb 5, 2023
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
Prev Previous commit
Apply suggestions from code review
  • Loading branch information
@eric-wieser
eric-wieser authored Feb 5, 2023
commit 26311aecd38ae115f88b38708bc65eacbbcab651
7 changes: 5 additions & 2 deletions Modules/_ctypes/stgdict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,9 @@ MakeAnonFields(PyObject *type)
}

/*
Append {padding}x to the PEP3118 format string.
Allocate a memory block for a pep3118 format string, copy prefix (if
non-null) into it and append `{padding}x` to the end.
Returns NULL on failure, with the error indicator set.
*/
char *
_ctypes_alloc_format_padding(const char *prefix, Py_ssize_t padding)
Expand All @@ -353,7 +355,8 @@ _ctypes_alloc_format_padding(const char *prefix, Py_ssize_t padding)
return _ctypes_alloc_format_string(prefix, "x");
}

sprintf(buf, "%zdx", padding);
int ret = PyOS_snprintf(buf, sizeof(buf), "%zdx", padding);
assert(0 <= ret && ret < sizeof(buf));
return _ctypes_alloc_format_string(prefix, buf);
}

Expand Down
0