diff options
| author | Michael W. Hudson <mwh@python.net> | 2005-01-31 17:09:25 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2005-01-31 17:09:25 (GMT) |
| commit | faa7648ffe6fbc568eeb6457815bd85cef21bfbd (patch) | |
| tree | b01b15ed12ebea91388f1b5efe3b94cdd25ef392 | |
| parent | 9867ced6c2ba0a47a3d6fa54fdcc0d3a7d31597b (diff) | |
| download | cpython-faa7648ffe6fbc568eeb6457815bd85cef21bfbd.zip cpython-faa7648ffe6fbc568eeb6457815bd85cef21bfbd.tar.gz cpython-faa7648ffe6fbc568eeb6457815bd85cef21bfbd.tar.bz2 | |
More bug #1077106 stuff, sorry -- modem induced impatiece!
This should go on whatever bugfix branches the other fetches up on.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/stringobject.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -21,6 +21,8 @@ Core and builtins - set and frozenset objects can now be marshalled. SF #1098985. +- Bug #1077106: Poor argument checking could cause memory corruption + in calls to os.read(). Extension Modules ----------------- diff --git a/Objects/stringobject.c b/Objects/stringobject.c index b8e5f41..b90221a 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -52,6 +52,7 @@ PyObject * PyString_FromStringAndSize(const char *str, int size) { register PyStringObject *op; + assert(size >= 0); if (size == 0 && (op = nullstring) != NULL) { #ifdef COUNT_ALLOCS null_strings++; |