dovecot-2.2: lib: data-stack - disambiguate sizes in t_pop_verify

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/9d85b31dfb74
changeset: 17642:9d85b31dfb74
user:      Phil Carmody <phil at dovecot.fi>
date:      Mon Jul 28 16:45:33 2014 +0300
description:
lib: data-stack - disambiguate sizes in t_pop_verify
In DEBUG mode, the allocated size is bigger than the requested size, so
rename the variable to reflect its real meaning, and move it into a
tighter scope in the process.

Signed-off-by: Phil Carmody <phil at dovecot.fi>

diffstat:

 src/lib/data-stack.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r 1778c2e77cfa -r 9d85b31dfb74 src/lib/data-stack.c
--- a/src/lib/data-stack.c	Mon Jul 28 16:45:33 2014 +0300
+++ b/src/lib/data-stack.c	Mon Jul 28 16:45:33 2014 +0300
@@ -223,7 +223,7 @@
 {
 	struct stack_block *block;
 	unsigned char *p;
-	size_t pos, max_pos, used_size, alloc_size;
+	size_t pos, max_pos, used_size;
 
 	block = current_frame_block->block[frame_pos];
 	pos = block->size - current_frame_block->block_space_used[frame_pos];
@@ -232,13 +232,13 @@
 		used_size = block->size - block->left;
 		p = STACK_BLOCK_DATA(block);
 		while (pos < used_size) {
-			alloc_size = *(size_t *)(p + pos);
-			if (used_size - pos < alloc_size)
+			size_t requested_size = *(size_t *)(p + pos);
+			if (used_size - pos < requested_size)
 				i_panic("data stack[%s]: saved alloc size broken",
 					current_frame_block->marker[frame_pos]);
-			pos += MEM_ALIGN(sizeof(alloc_size));
-			max_pos = pos + MEM_ALIGN(alloc_size + SENTRY_COUNT);
-			pos += alloc_size;
+			pos += MEM_ALIGN(sizeof(size_t));
+			max_pos = pos + MEM_ALIGN(requested_size + SENTRY_COUNT);
+			pos += requested_size;
 
 			for (; pos < max_pos; pos++) {
 				if (p[pos] != CLEAR_CHR)