From faa7648ffe6fbc568eeb6457815bd85cef21bfbd Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Mon, 31 Jan 2005 17:09:25 +0000 Subject: More bug #1077106 stuff, sorry -- modem induced impatiece! This should go on whatever bugfix branches the other fetches up on. --- Misc/NEWS | 2 ++ Objects/stringobject.c | 1 + 2 files changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 92d94224fc..926ac5233d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 b8e5f41342..b90221a6b8 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++; -- cgit v1.2.1