[Python-checkins] python/dist/src/Modules nismodule.c,2.21,2.21.24.1

[nnorwitz@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv24338/Modules

Modified Files:
      Tag: release22-maint
	nismodule.c 
Log Message:
Backport last checkin:
SF #633013, Fix NIS causing interpreter core dump

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


Index: nismodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/nismodule.c,v
retrieving revision 2.21
retrieving revision 2.21.24.1
diff -C2 -d -r2.21 -r2.21.24.1
*** nismodule.c	21 Jan 2001 23:34:12 -0000	2.21
--- nismodule.c	4 Nov 2002 23:40:47 -0000	2.21.24.1
***************
*** 86,91 ****
  
  		if (indata->fix) {
! 		    inkeylen--;
! 		    invallen--;
  		}
  		key = PyString_FromStringAndSize(inkey, inkeylen);
--- 86,93 ----
  
  		if (indata->fix) {
! 		    if (inkeylen > 0 && inkey[inkeylen-1] == '\0')
! 			inkeylen--;
! 		    if (invallen > 0 && inval[invallen-1] == '\0')
! 			invallen--;
  		}
  		key = PyString_FromStringAndSize(inkey, inkeylen);