summaryrefslogtreecommitdiffstats
path: root/firmware/buflib.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-05-29 06:48:33 +0200
committerThomas Martitz <kugel@rockbox.org>2013-06-24 15:24:34 +0200
commit46ea8bfe7c690c8db230fff3a582a69779f8e432 (patch)
tree38367d14c1997b3b4d5b4c6c7fbd31d2c3de979e /firmware/buflib.c
parentd938ae692cfc720210236eccd7910abe15c761c0 (diff)
downloadrockbox-46ea8bfe7c690c8db230fff3a582a69779f8e432.tar.gz
rockbox-46ea8bfe7c690c8db230fff3a582a69779f8e432.tar.bz2
rockbox-46ea8bfe7c690c8db230fff3a582a69779f8e432.zip
buflib: Allow handle to be freed entirely during the shrink callback.
Change-Id: I3a069dcb99bbd4022faf37596b03beb926d2ea82 Reviewed-on: http://gerrit.rockbox.org/480 Reviewed-by: Thomas Martitz <kugel@rockbox.org> Tested-by: Thomas Martitz <kugel@rockbox.org>
Diffstat (limited to 'firmware/buflib.c')
-rw-r--r--firmware/buflib.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/firmware/buflib.c b/firmware/buflib.c
index 9b591ad786..2ceb7fcb16 100644
--- a/firmware/buflib.c
+++ b/firmware/buflib.c
@@ -165,7 +165,7 @@ static union buflib_data* handle_to_block(struct buflib_context* ctx, int handle
union buflib_data* name_field =
(union buflib_data*)buflib_get_name(ctx, handle);
- return name_field - 3;
+ return name_field ? name_field - 3 : NULL;
}
/* Shrink the handle table, returning true if its size was reduced, false if
@@ -353,11 +353,15 @@ buflib_compact_and_shrink(struct buflib_context *ctx, unsigned shrink_hints)
ret = this[2].ops->shrink_callback(handle, shrink_hints,
data, (char*)(this+this->val)-data);
result |= (ret == BUFLIB_CB_OK);
- /* this might have changed in the callback (if
- * it shrinked from the top), get it again */
+ /* 'this' might have changed in the callback (if it shrinked
+ * from the top or even freed the handle), get it again */
this = handle_to_block(ctx, handle);
+ /* The handle was possibly be freed in the callback,
+ * re-run the loop with the handle before */
+ if (!this)
+ this = before;
/* could also change with shrinking from back */
- if (last)
+ else if (last)
ctx->alloc_end = this + this->val;
}
}
@@ -780,6 +784,8 @@ buflib_shrink(struct buflib_context* ctx, int handle, void* new_start, size_t ne
const char* buflib_get_name(struct buflib_context *ctx, int handle)
{
union buflib_data *data = ALIGN_DOWN(buflib_get_data(ctx, handle), sizeof (*data));
+ if (!data)
+ return NULL;
size_t len = data[-1].val;
if (len <= 1)
return NULL;