Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
73207e03
Commit
73207e03
authored
Aug 06, 2013
by
Christian Heimes
Browse files
Options
Browse Files
Download
Plain Diff
Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.
parents
9b855de8
9ae513ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
Misc/NEWS
Misc/NEWS
+3
-0
Parser/myreadline.c
Parser/myreadline.c
+17
-5
No files found.
Misc/NEWS
View file @
73207e03
...
...
@@ -10,6 +10,9 @@ Projected Release date: 2013-09-08
Core and Builtins
-----------------
- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
fail
- Issue #17934: Add a clear() method to frame objects, to help clean up
expensive details (local variables) and break reference cycles.
...
...
Parser/myreadline.c
View file @
73207e03
...
...
@@ -112,7 +112,7 @@ char *
PyOS_StdioReadline
(
FILE
*
sys_stdin
,
FILE
*
sys_stdout
,
char
*
prompt
)
{
size_t
n
;
char
*
p
;
char
*
p
,
*
pr
;
n
=
100
;
if
((
p
=
(
char
*
)
PyMem_MALLOC
(
n
))
==
NULL
)
return
NULL
;
...
...
@@ -135,17 +135,29 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
n
=
strlen
(
p
);
while
(
n
>
0
&&
p
[
n
-
1
]
!=
'\n'
)
{
size_t
incr
=
n
+
2
;
p
=
(
char
*
)
PyMem_REALLOC
(
p
,
n
+
incr
);
if
(
p
==
NULL
)
return
NULL
;
if
(
incr
>
INT_MAX
)
{
PyMem_FREE
(
p
);
PyErr_SetString
(
PyExc_OverflowError
,
"input line too long"
);
return
NULL
;
}
pr
=
(
char
*
)
PyMem_REALLOC
(
p
,
n
+
incr
);
if
(
pr
==
NULL
)
{
PyMem_FREE
(
p
);
PyErr_NoMemory
();
return
NULL
;
}
p
=
pr
;
if
(
my_fgets
(
p
+
n
,
(
int
)
incr
,
sys_stdin
)
!=
0
)
break
;
n
+=
strlen
(
p
+
n
);
}
return
(
char
*
)
PyMem_REALLOC
(
p
,
n
+
1
);
pr
=
(
char
*
)
PyMem_REALLOC
(
p
,
n
+
1
);
if
(
pr
==
NULL
)
{
PyMem_FREE
(
p
);
PyErr_NoMemory
();
return
NULL
;
}
return
pr
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment