diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2017-02-10 20:10:14 -0500 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2017-02-10 20:58:03 -0500 |
| commit | 6436c6e749ab04fbd5d97804a6a1c3b3122b326d (patch) | |
| tree | 0f5a8109c15e5f7ffb8021725719a4d791b149aa /apps | |
| parent | f483a079508f100dcc3f654f674f387a40e5cd6a (diff) | |
| download | rockbox-6436c6e749ab04fbd5d97804a6a1c3b3122b326d.tar.gz rockbox-6436c6e749ab04fbd5d97804a6a1c3b3122b326d.zip | |
Fix tagtree from blowing up when its buffer moves
I noticed that after booting with the external storage removed,
playing from tagtree, inserting the card, forcing dircache to
reallocate from the debug screen, and trying to reenter tagtree,
it would data abort because the dircache reallaction to a larger
size caused the tagtree buffer to move.
Adjustment to at least one pointer (csi) was missed. Since it's
non-trivial there to determine when things should be NULL and
when they shouldn't, add check for menu too before moving it.
As for the rest, who knows.
Change-Id: Iea6538a2091b4b47083f39296555efc47edf8ba8
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/tagtree.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c index b3b94a489e..ba27c84f6a 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -201,7 +201,12 @@ static int move_callback(int handle, void* current, void* new) if (lock_count > 0) return BUFLIB_CB_CANNOT_MOVE; - UPDATE(menu, diff); + if (menu) + UPDATE(menu, diff); + + if (csi) + UPDATE(csi, diff); + /* loop over menus */ for(int i = 0; i < menu_count; i++) { |