mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 15:00:45 -08:00
Code Issues Projects Releases Wiki Activity

* doc.c (get_doc_string): Rework so that

Browse source 
get_doc_string_buffer_size is the actual buffer size, rather than
being 1 less than the actual buffer size; this makes xpalloc more
convenient.
This commit is contained in:
Paul Eggert 2011-08-18 01:37:41 -07:00
parent bc81e2c4e8
commit d31850da41
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -2,6 +2,11 @@
Integer and memory overflow issues (Bug#9196).
* doc.c (get_doc_string): Rework so that
get_doc_string_buffer_size is the actual buffer size, rather than
being 1 less than the actual buffer size; this makes xpalloc more
convenient.
* image.c (x_allocate_bitmap_record, cache_image):
* xselect.c (Fx_register_dnd_atom):
Simplify previous changes by using xpalloc.

6
src/doc.c
View file

@ -166,19 +166,19 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
p = get_doc_string_buffer;
while (1)
{
ptrdiff_t space_left = (get_doc_string_buffer_size
ptrdiff_t space_left = (get_doc_string_buffer_size - 1
- (p - get_doc_string_buffer));
int nread;
/* Allocate or grow the buffer if we need to. */
if (space_left == 0)
if (space_left <= 0)
{
ptrdiff_t in_buffer = p - get_doc_string_buffer;
get_doc_string_buffer =
xpalloc (get_doc_string_buffer, &get_doc_string_buffer_size,
16 * 1024, -1, 1);
p = get_doc_string_buffer + in_buffer;
space_left = (get_doc_string_buffer_size
space_left = (get_doc_string_buffer_size - 1
- (p - get_doc_string_buffer));
}