diff options
author | Ian Romanick <[email protected]> | 2005-08-19 18:53:26 +0000 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2005-08-19 18:53:26 +0000 |
commit | 2ae5645115124ecc97bf4a0ba9f5542cf2409845 (patch) | |
tree | 9cd06468e24d54d30d118e0b9e1b2edf83406c12 /src/glx | |
parent | b7c727e5006e26be3f70396030aab7512498f441 (diff) |
Fix a realloc problem with indirect vertex arrays. The actual head pointer
wasn't tracked and used for the realloc, so it tended to explode.
Diffstat (limited to 'src/glx')
-rw-r--r-- | src/glx/x11/indirect_va_private.h | 4 | ||||
-rw-r--r-- | src/glx/x11/indirect_vertex_array.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/glx/x11/indirect_va_private.h b/src/glx/x11/indirect_va_private.h index 0b0227f0e28..ab97dc645fb 100644 --- a/src/glx/x11/indirect_va_private.h +++ b/src/glx/x11/indirect_va_private.h @@ -211,12 +211,14 @@ struct array_state_vector { * There are some bytes of extra data before \c array_info_cache that is * used to hold the header for RenderLarge commands. This is * \b not included in \c array_info_cache_size or - * \c array_info_cache_buffer_size. + * \c array_info_cache_buffer_size. \c array_info_cache_base stores a + * pointer to the true start of the buffer (i.e., what malloc returned). */ /*@{*/ size_t array_info_cache_size; size_t array_info_cache_buffer_size; void * array_info_cache; + void * array_info_cache_base; /*@}*/ diff --git a/src/glx/x11/indirect_vertex_array.c b/src/glx/x11/indirect_vertex_array.c index d4e6ab99ca9..62a101e6656 100644 --- a/src/glx/x11/indirect_vertex_array.c +++ b/src/glx/x11/indirect_vertex_array.c @@ -382,13 +382,14 @@ allocate_array_info_cache( struct array_state_vector * arrays, { #define MAX_HEADER_SIZE 20 if ( arrays->array_info_cache_buffer_size < required_size ) { - GLubyte * temp = realloc( arrays->array_info_cache, required_size - + MAX_HEADER_SIZE ); + GLubyte * temp = realloc( arrays->array_info_cache_base, + required_size + MAX_HEADER_SIZE ); if ( temp == NULL ) { return GL_FALSE; } + arrays->array_info_cache_base = temp; arrays->array_info_cache = temp + MAX_HEADER_SIZE; arrays->array_info_cache_buffer_size = required_size; } |