diff options
| author | Andrea Corallo | 2020-10-10 11:00:35 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2020-10-10 11:00:35 +0200 |
| commit | f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8 (patch) | |
| tree | 8757f25ff7948b6b045bd60f5adf6ebf91ed75ee /src/alloc.c | |
| parent | 138990bbda7ab228e3fde44710426c474b2c1086 (diff) | |
| parent | 5824c209ba17b97978519ea62478c57010311e88 (diff) | |
| download | emacs-f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8.tar.gz emacs-f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index bde0a16ac15..fbfa814bcd8 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1658,7 +1658,7 @@ sdata_size (ptrdiff_t n) | |||
| 1658 | #define GC_STRING_EXTRA GC_STRING_OVERRUN_COOKIE_SIZE | 1658 | #define GC_STRING_EXTRA GC_STRING_OVERRUN_COOKIE_SIZE |
| 1659 | 1659 | ||
| 1660 | /* Exact bound on the number of bytes in a string, not counting the | 1660 | /* Exact bound on the number of bytes in a string, not counting the |
| 1661 | terminating NUL. A string cannot contain more bytes than | 1661 | terminating null. A string cannot contain more bytes than |
| 1662 | STRING_BYTES_BOUND, nor can it be so long that the size_t | 1662 | STRING_BYTES_BOUND, nor can it be so long that the size_t |
| 1663 | arithmetic in allocate_string_data would overflow while it is | 1663 | arithmetic in allocate_string_data would overflow while it is |
| 1664 | calculating a value to be passed to malloc. */ | 1664 | calculating a value to be passed to malloc. */ |