Re #18521: move array bounds check before array access.

This commit is contained in:
Georg Brandl 2013-10-14 07:01:11 +02:00
parent 6083a4bc1c
commit 142ad666dc

View File

@ -376,7 +376,7 @@ seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname,
"argument %" PY_FORMAT_SIZE_T "d", iarg); "argument %" PY_FORMAT_SIZE_T "d", iarg);
i = 0; i = 0;
p += strlen(p); p += strlen(p);
while (levels[i] > 0 && i < 32 && (int)(p-buf) < 220) { while (i < 32 && levels[i] > 0 && (int)(p-buf) < 220) {
PyOS_snprintf(p, sizeof(buf) - (p - buf), PyOS_snprintf(p, sizeof(buf) - (p - buf),
", item %d", levels[i]-1); ", item %d", levels[i]-1);
p += strlen(p); p += strlen(p);