*** /home/trentm/main/contrib/python/dist/src/Parser/myreadline.c Thu Jun 1 00:13:40 2000 --- /home/trentm/main/Apps/Perlium/Python/dist/src/Parser/myreadline.c Fri Jun 2 15:53:44 2000 *************** *** 86,92 **** PyOS_StdioReadline(prompt) char *prompt; { ! int n; char *p; n = 100; if ((p = PyMem_MALLOC(n)) == NULL) --- 86,92 ---- PyOS_StdioReadline(prompt) char *prompt; { ! size_t n; char *p; n = 100; if ((p = PyMem_MALLOC(n)) == NULL) *************** *** 95,101 **** if (prompt) fprintf(stderr, "%s", prompt); fflush(stderr); ! switch (my_fgets(p, n, stdin)) { case 0: /* Normal case */ break; case 1: /* Interrupt */ --- 95,101 ---- if (prompt) fprintf(stderr, "%s", prompt); fflush(stderr); ! switch (my_fgets(p, (int)n, stdin)) { case 0: /* Normal case */ break; case 1: /* Interrupt */ *************** *** 116,126 **** #endif n = strlen(p); while (n > 0 && p[n-1] != '\n') { ! int incr = n+2; p = PyMem_REALLOC(p, n + incr); if (p == NULL) return NULL; ! if (my_fgets(p+n, incr, stdin) != 0) break; n += strlen(p+n); } --- 116,129 ---- #endif n = strlen(p); while (n > 0 && p[n-1] != '\n') { ! size_t incr = n+2; p = PyMem_REALLOC(p, n + incr); if (p == NULL) return NULL; ! if (incr > INT_MAX) { ! PyErr_SetString(PyExc_OverflowError, "input line too long"); ! } ! if (my_fgets(p+n, (int)incr, stdin) != 0) break; n += strlen(p+n); } *** /home/trentm/main/contrib/python/dist/src/Parser/parsetok.c Thu Jun 1 00:13:40 2000 --- /home/trentm/main/Apps/Perlium/Python/dist/src/Parser/parsetok.c Fri Jun 2 15:53:44 2000 *************** *** 143,149 **** for (;;) { char *a, *b; int type; ! int len; char *str; type = PyTokenizer_Get(tok, &a, &b); --- 143,149 ---- for (;;) { char *a, *b; int type; ! size_t len; char *str; type = PyTokenizer_Get(tok, &a, &b); *************** *** 191,197 **** err_ret->lineno = tok->lineno; err_ret->offset = tok->cur - tok->buf; if (tok->buf != NULL) { ! int len = tok->inp - tok->buf; err_ret->text = PyMem_NEW(char, len + 1); if (err_ret->text != NULL) { if (len > 0) --- 191,197 ---- err_ret->lineno = tok->lineno; err_ret->offset = tok->cur - tok->buf; if (tok->buf != NULL) { ! size_t len = tok->inp - tok->buf; err_ret->text = PyMem_NEW(char, len + 1); if (err_ret->text != NULL) { if (len > 0) *** /home/trentm/main/contrib/python/dist/src/Parser/pgenmain.c Thu Jun 1 00:13:40 2000 --- /home/trentm/main/Apps/Perlium/Python/dist/src/Parser/pgenmain.c Fri Jun 2 15:53:44 2000 *************** *** 127,133 **** fprintf(stderr, "Parsing error %d, line %d.\n", err.error, err.lineno); if (err.text != NULL) { ! int i; fprintf(stderr, "%s", err.text); i = strlen(err.text); if (i == 0 || err.text[i-1] != '\n') --- 127,133 ---- fprintf(stderr, "Parsing error %d, line %d.\n", err.error, err.lineno); if (err.text != NULL) { ! size_t i; fprintf(stderr, "%s", err.text); i = strlen(err.text); if (i == 0 || err.text[i-1] != '\n') *************** *** 195,201 **** PyOS_Readline(prompt) char *prompt; { ! int n = 1000; char *p = PyMem_MALLOC(n); char *q; if (p == NULL) --- 195,201 ---- PyOS_Readline(prompt) char *prompt; { ! size_t n = 1000; char *p = PyMem_MALLOC(n); char *q; if (p == NULL) *** /home/trentm/main/contrib/python/dist/src/Parser/tokenizer.c Thu Jun 1 00:13:40 2000 --- /home/trentm/main/Apps/Perlium/Python/dist/src/Parser/tokenizer.c Fri Jun 2 15:53:44 2000 *************** *** 223,231 **** tok->done = E_EOF; } else if (tok->start != NULL) { ! int start = tok->start - tok->buf; ! int oldlen = tok->cur - tok->buf; ! int newlen = oldlen + strlen(new); char *buf = tok->buf; PyMem_RESIZE(buf, char, newlen+1); tok->lineno++; --- 223,231 ---- tok->done = E_EOF; } else if (tok->start != NULL) { ! size_t start = tok->start - tok->buf; ! size_t oldlen = tok->cur - tok->buf; ! size_t newlen = oldlen + strlen(new); char *buf = tok->buf; PyMem_RESIZE(buf, char, newlen+1); tok->lineno++;