Commit 815f48f1 authored by Neal Norwitz's avatar Neal Norwitz

SF #633013, Fix NIS causing interpreter core dump

Prevent the lengths passed to PyString_FromStringAndSize()
from being negative in some cases.
parent d11e1900
...@@ -85,8 +85,10 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval, ...@@ -85,8 +85,10 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
int err; int err;
if (indata->fix) { if (indata->fix) {
inkeylen--; if (inkeylen > 0 && inkey[inkeylen-1] == '\0')
invallen--; inkeylen--;
if (invallen > 0 && inval[invallen-1] == '\0')
invallen--;
} }
key = PyString_FromStringAndSize(inkey, inkeylen); key = PyString_FromStringAndSize(inkey, inkeylen);
val = PyString_FromStringAndSize(inval, invallen); val = PyString_FromStringAndSize(inval, invallen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment