muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a simple bug; oops

partial-rewrite
Ben Blazak 2013-07-23 22:36:14 -07:00
parent c6944a095e
commit 57c43089ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/lib/layout/layer-stack/layer-stack.c
View File

@ -120,6 +120,7 @@ static uint8_t resize_stack(void) {
stack.allocated = new_allocated;
stack.data = new_data;
return 0; // success
}
@ -145,12 +146,11 @@ uint8_t layer_stack__push( uint8_t offset,
}
}
uint8_t index = stack.filled-1-offset;
// add an element
if (stack.filled == UINT8_MAX)
return UINT8_MAX; // error: stack already full
stack.filled++;
uint8_t index = stack.filled-1-offset;
if (index > stack.filled-1 || resize_stack()) {
stack.filled--;
return UINT8_MAX; // error: index out of bounds, or resize failed
@ -190,7 +190,7 @@ uint8_t layer_stack__pop_id(uint8_t layer_id) {
// remove an element
stack.filled--;
resize_stack();
resize_stack(); // we're shrinking the stack, so this should never fail
return offset; // success
}