diff options
| author | Paul Eggert | 2011-06-19 11:30:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-19 11:30:19 -0700 |
| commit | 989f33ba6bda51e06241f2e5a7b07f9feb435057 (patch) | |
| tree | 8540ff4f1d873661621fc24d3293683fa5d88f9c /src/callproc.c | |
| parent | 965d34ebb3b4226d6ace4c53cf3b15c8c4159e5c (diff) | |
| download | emacs-989f33ba6bda51e06241f2e5a7b07f9feb435057.tar.gz emacs-989f33ba6bda51e06241f2e5a7b07f9feb435057.zip | |
* callproc.c: Don't assume string length fits in 'int.'
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/callproc.c b/src/callproc.c index d6bad2a44e7..fae47b7a699 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1378,8 +1378,8 @@ relocate_fd (int fd, int minfd) | |||
| 1378 | #endif /* not WINDOWSNT */ | 1378 | #endif /* not WINDOWSNT */ |
| 1379 | 1379 | ||
| 1380 | static int | 1380 | static int |
| 1381 | getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen, | 1381 | getenv_internal_1 (const char *var, ptrdiff_t varlen, char **value, |
| 1382 | Lisp_Object env) | 1382 | ptrdiff_t *valuelen, Lisp_Object env) |
| 1383 | { | 1383 | { |
| 1384 | for (; CONSP (env); env = XCDR (env)) | 1384 | for (; CONSP (env); env = XCDR (env)) |
| 1385 | { | 1385 | { |
| @@ -1413,8 +1413,8 @@ getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen, | |||
| 1413 | } | 1413 | } |
| 1414 | 1414 | ||
| 1415 | static int | 1415 | static int |
| 1416 | getenv_internal (const char *var, int varlen, char **value, int *valuelen, | 1416 | getenv_internal (const char *var, ptrdiff_t varlen, char **value, |
| 1417 | Lisp_Object frame) | 1417 | ptrdiff_t *valuelen, Lisp_Object frame) |
| 1418 | { | 1418 | { |
| 1419 | /* Try to find VAR in Vprocess_environment first. */ | 1419 | /* Try to find VAR in Vprocess_environment first. */ |
| 1420 | if (getenv_internal_1 (var, varlen, value, valuelen, | 1420 | if (getenv_internal_1 (var, varlen, value, valuelen, |
| @@ -1454,7 +1454,7 @@ If optional parameter ENV is a list, then search this list instead of | |||
| 1454 | (Lisp_Object variable, Lisp_Object env) | 1454 | (Lisp_Object variable, Lisp_Object env) |
| 1455 | { | 1455 | { |
| 1456 | char *value; | 1456 | char *value; |
| 1457 | int valuelen; | 1457 | ptrdiff_t valuelen; |
| 1458 | 1458 | ||
| 1459 | CHECK_STRING (variable); | 1459 | CHECK_STRING (variable); |
| 1460 | if (CONSP (env)) | 1460 | if (CONSP (env)) |