Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32k
gh-134209: use heap-allocated memory in_curses.window.{instr,getstr}#134283
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
34 commits Select commitHold shift + click to select a range
46a6f47 made curses buffer heap allocated instead of stack
zydtiger7eeb8f6 change docs to explicitly mention the max buffer size
zydtigerd5aa3db remove unintentional changes
zydtiger020d798 📜🤖 Added by blurb_it.
blurb-it[bot]823fa38 reword news to satify linter
zydtiger571091d Merge branch 'main' into fix-issue-134209
zydtiger1e7edf4 Merge branch 'main' into fix-issue-134209
zydtiger0cb5fe0 Reword the ReST news entry.
gpshead63a3ed2 use rtn value from winnstr instead of strlen
zydtiger58d6cde changing GetStr() function to behave similarly too
zydtiger82c9b1c updated curses doc for getstr function
zydtiger04a9b14 Merge branch 'main' into fix-issue-134209
zydtigercbce07b Update Doc/library/curses.rst
zydtigerdfd210d Update Doc/library/curses.rst
zydtigerad832bd Update Misc/NEWS.d/next/Library/2025-05-19-20-59-06.gh-issue-134209.a…
zydtigerf7a51f9 Update Modules/_cursesmodule.c
zydtigere5597a2 Update Modules/_cursesmodule.c
zydtiger5dd4304 Update Modules/_cursesmodule.c
zydtigerd868088 Update instr with proper return error handling
zydtiger1a519cb Update Modules/_cursesmodule.c
zydtiger87bb8cb Merge branch 'main' into fix-issue-134209
zydtiger083f855 change to strlen and better memory safety
zydtiger20046cb Update Doc/library/curses.rst
zydtigerfd5c3f4 Update Doc/library/curses.rst
zydtigerc061f89 change from const int to Py_ssize_t
zydtigerd11b04f Merge branch 'main' into fix-issue-134209
zydtigerc3323a3 fix indent
zydtiger12d4a5f Update Doc/library/curses.rst
zydtiger769ba15 add mem allocation guard
zydtiger59b49b4 remove trailing spaces in line
zydtiger5bfa810 Merge branch 'main' into fix-issue-134209
zydtiger6510d09 fix indent
zydtiger6eccdc9 update versionchanged to mention it was an increase.
gpshead769bb87 explicitly use versionchanged 3.14 as that is its own branch now.
gpsheadFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
8 changes: 8 additions & 0 deletionsDoc/library/curses.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletionsMisc/NEWS.d/next/Library/2025-05-19-20-59-06.gh-issue-134209.anhTcF.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| :mod:`curses`: The :meth:`curses.window.instr` and :meth:`curses.window.getstr` | ||
| methods now allocate their internal buffer on the heap instead of the stack; | ||
| in addition, the max buffer size is increased from 1023 to 2047. |
102 changes: 69 additions & 33 deletionsModules/_cursesmodule.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1816,7 +1816,7 @@ _curses.window.getstr | ||
| x: int | ||
| X-coordinate. | ||
| ] | ||
| n: int =2047 | ||
| Maximal number of characters. | ||
| / | ||
| @@ -1829,62 +1829,80 @@ PyCursesWindow_GetStr(PyObject *op, PyObject *args) | ||
| PyCursesWindowObject *self = _PyCursesWindowObject_CAST(op); | ||
| int x, y, n; | ||
| int rtn; | ||
| /* could make the buffer size larger/dynamic */ | ||
| Py_ssize_t max_buf_size = 2048; | ||
| PyObject *result = PyBytes_FromStringAndSize(NULL, max_buf_size); | ||
| if (result == NULL) | ||
| return NULL; | ||
| char *buf = PyBytes_AS_STRING(result); | ||
| switch (PyTuple_Size(args)) { | ||
| case 0: | ||
| Py_BEGIN_ALLOW_THREADS | ||
| rtn = wgetnstr(self->win, buf, max_buf_size - 1); | ||
| Py_END_ALLOW_THREADS | ||
| break; | ||
| case 1: | ||
| if (!PyArg_ParseTuple(args,"i;n", &n)) | ||
| goto error; | ||
| if (n < 0) { | ||
| PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative"); | ||
| goto error; | ||
| } | ||
| Py_BEGIN_ALLOW_THREADS | ||
| rtn = wgetnstr(self->win,buf, Py_MIN(n,max_buf_size - 1)); | ||
| Py_END_ALLOW_THREADS | ||
| break; | ||
| case 2: | ||
| if (!PyArg_ParseTuple(args,"ii;y,x",&y,&x)) | ||
| goto error; | ||
| Py_BEGIN_ALLOW_THREADS | ||
| #ifdef STRICT_SYSV_CURSES | ||
| rtn = wmove(self->win,y,x)==ERR ? ERR : wgetnstr(self->win, rtn,max_buf_size - 1); | ||
| #else | ||
| rtn = mvwgetnstr(self->win,y,x,buf, max_buf_size - 1); | ||
| #endif | ||
| Py_END_ALLOW_THREADS | ||
| break; | ||
| case 3: | ||
| if (!PyArg_ParseTuple(args,"iii;y,x,n", &y, &x, &n)) | ||
| goto error; | ||
| if (n < 0) { | ||
| PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative"); | ||
| goto error; | ||
| } | ||
| #ifdef STRICT_SYSV_CURSES | ||
| Py_BEGIN_ALLOW_THREADS | ||
| rtn = wmove(self->win,y,x)==ERR ? ERR : | ||
| wgetnstr(self->win, rtn, Py_MIN(n,max_buf_size - 1)); | ||
| Py_END_ALLOW_THREADS | ||
| #else | ||
| Py_BEGIN_ALLOW_THREADS | ||
| rtn = mvwgetnstr(self->win, y, x,buf, Py_MIN(n,max_buf_size - 1)); | ||
| Py_END_ALLOW_THREADS | ||
| #endif | ||
| break; | ||
| default: | ||
| PyErr_SetString(PyExc_TypeError, "getstr requires 0 to 3 arguments"); | ||
| goto error; | ||
| } | ||
| if (rtn == ERR) { | ||
| Py_DECREF(result); | ||
| return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES); | ||
| } | ||
| if (_PyBytes_Resize(&result, strlen(buf)) < 0) { | ||
| return NULL; | ||
| } | ||
| return result; | ||
| error: | ||
| Py_DECREF(result); | ||
| return NULL; | ||
| } | ||
| /*[clinic input] | ||
| @@ -2023,7 +2041,7 @@ _curses.window.instr | ||
| x: int | ||
| X-coordinate. | ||
| ] | ||
| n: int =2047 | ||
| Maximal number of characters. | ||
| / | ||
| @@ -2040,43 +2058,61 @@ PyCursesWindow_InStr(PyObject *op, PyObject *args) | ||
| PyCursesWindowObject *self = _PyCursesWindowObject_CAST(op); | ||
picnixz marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| int x, y, n; | ||
| int rtn; | ||
| /* could make the buffer size larger/dynamic */ | ||
| Py_ssize_t max_buf_size = 2048; | ||
| PyObject *result = PyBytes_FromStringAndSize(NULL, max_buf_size); | ||
| if (result == NULL) | ||
| return NULL; | ||
| char *buf = PyBytes_AS_STRING(result); | ||
| switch (PyTuple_Size(args)) { | ||
| case 0: | ||
| rtn = winnstr(self->win, buf, max_buf_size - 1); | ||
| break; | ||
| case 1: | ||
| if (!PyArg_ParseTuple(args,"i;n", &n)) | ||
| goto error; | ||
| if (n < 0) { | ||
| PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative"); | ||
| goto error; | ||
| } | ||
| rtn = winnstr(self->win,buf, Py_MIN(n,max_buf_size - 1)); | ||
| break; | ||
| case 2: | ||
| if (!PyArg_ParseTuple(args,"ii;y,x",&y,&x)) | ||
| goto error; | ||
| rtn = mvwinnstr(self->win, y, x, buf, max_buf_size - 1); | ||
| break; | ||
| case 3: | ||
| if (!PyArg_ParseTuple(args, "iii;y,x,n", &y, &x, &n)) | ||
| goto error; | ||
| if (n < 0) { | ||
| PyErr_SetString(PyExc_ValueError, "'n' must be nonnegative"); | ||
| goto error; | ||
| } | ||
| rtn = mvwinnstr(self->win, y, x,buf, Py_MIN(n, max_buf_size - 1)); | ||
| break; | ||
| default: | ||
| PyErr_SetString(PyExc_TypeError, "instr requires 0 or 3 arguments"); | ||
| goto error; | ||
| } | ||
| if (rtn == ERR) { | ||
zydtiger marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| Py_DECREF(result); | ||
| return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES); | ||
| } | ||
| if (_PyBytes_Resize(&result, strlen(buf)) < 0) { | ||
| return NULL; | ||
| } | ||
| return result; | ||
| error: | ||
| Py_DECREF(result); | ||
| return NULL; | ||
| } | ||
| /*[clinic input] | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.