From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 4 Nov 2002 23:40:47 +0000 (+0000)
Subject: Backport last checkin:
X-Git-Tag: v2.2.3c1~253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed650c12d93fe17d4804a24412036bf5986817f5;p=thirdparty%2FPython%2Fcpython.git

Backport last checkin:
SF #633013, Fix NIS causing interpreter core dump

Prevent the lengths passed to PyString_FromStringAndSize()
from being negative in some cases.
---

diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index bcc8e9f968e9..b9fe927613a9 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -85,8 +85,10 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
 		int err;
 
 		if (indata->fix) {
-		    inkeylen--;
-		    invallen--;
+		    if (inkeylen > 0 && inkey[inkeylen-1] == '\0')
+			inkeylen--;
+		    if (invallen > 0 && inval[invallen-1] == '\0')
+			invallen--;
 		}
 		key = PyString_FromStringAndSize(inkey, inkeylen);
 		val = PyString_FromStringAndSize(inval, invallen);