SF #633013, Fix NIS causing interpreter core dump

Prevent the lengths passed to PyString_FromStringAndSize() from being negative in some cases.
ALS024 · Nov 4, 2002 · 6623906 · 6623906
1 parent 72a8a3b
commit 6623906
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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);