From bd360b422ae4b03c3ef161ad5fd204feb9c6c62c Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Sun, 27 Nov 2011 01:40:47 +0000 Subject: [PATCH] In buflib_buffer_shift(), properly update handle->alloc values, which are char * and not union buflib data * git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31066 a1c6a512-1295-4272-9138-f99709370657 --- firmware/buflib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/buflib.c b/firmware/buflib.c index 43fc4bd3de..748e8a2378 100644 --- a/firmware/buflib.c +++ b/firmware/buflib.c @@ -366,12 +366,13 @@ buflib_buffer_shift(struct buflib_context *ctx, int shift) { memmove(ctx->buf_start + shift, ctx->buf_start, (ctx->alloc_end - ctx->buf_start) * sizeof(union buflib_data)); + ctx->buf_start += shift; + ctx->alloc_end += shift; + shift *= sizeof(union buflib_data); union buflib_data *handle; for (handle = ctx->last_handle; handle < ctx->handle_table; handle++) if (handle->alloc) handle->alloc += shift; - ctx->buf_start += shift; - ctx->alloc_end += shift; } /* Shift buffered items up by size bytes, or as many as possible if size == 0.