diff options
| author | Paul Eggert | 2011-06-19 23:11:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-19 23:11:36 -0700 |
| commit | 6e5bb2dc82e57e8666eae89848050a78554709fa (patch) | |
| tree | 7050bfb4fa3f4c1acfe565627750e698d42e491e /src | |
| parent | 52c61c22eeda7b11969f44d3c002ad94f228f29d (diff) | |
| download | emacs-6e5bb2dc82e57e8666eae89848050a78554709fa.tar.gz emacs-6e5bb2dc82e57e8666eae89848050a78554709fa.zip | |
* lread.c (intern, intern_c_string): Don't assume strlen fits in int.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/lread.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b1035da6c7b..8bff8e53fbd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | 2011-06-20 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-20 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lread.c (intern, intern_c_string): | ||
| 3 | * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]: | 4 | * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]: |
| 4 | Don't assume string length fits in int. | 5 | Don't assume string length fits in int. |
| 5 | 6 | ||
diff --git a/src/lread.c b/src/lread.c index 5f8d6b84c3c..e75d61ae985 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -3650,7 +3650,7 @@ Lisp_Object | |||
| 3650 | intern (const char *str) | 3650 | intern (const char *str) |
| 3651 | { | 3651 | { |
| 3652 | Lisp_Object tem; | 3652 | Lisp_Object tem; |
| 3653 | int len = strlen (str); | 3653 | ptrdiff_t len = strlen (str); |
| 3654 | Lisp_Object obarray; | 3654 | Lisp_Object obarray; |
| 3655 | 3655 | ||
| 3656 | obarray = Vobarray; | 3656 | obarray = Vobarray; |
| @@ -3666,7 +3666,7 @@ Lisp_Object | |||
| 3666 | intern_c_string (const char *str) | 3666 | intern_c_string (const char *str) |
| 3667 | { | 3667 | { |
| 3668 | Lisp_Object tem; | 3668 | Lisp_Object tem; |
| 3669 | int len = strlen (str); | 3669 | ptrdiff_t len = strlen (str); |
| 3670 | Lisp_Object obarray; | 3670 | Lisp_Object obarray; |
| 3671 | 3671 | ||
| 3672 | obarray = Vobarray; | 3672 | obarray = Vobarray; |