devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Dircache: Fix bug introduced in r30308.

Browse source 
dircache_root wasn't initialized at all and the giving allocated_size
passed to buffer_release_buffer() didn't account for alignment padding.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30318 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-08-15 15:13:17 +00:00
parent bf34cdfacb
commit 4087875f1c
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/common/dircache.c
View file

@ -864,8 +864,9 @@ int dircache_build(int last_size)
* free bytes inbetween */ * free bytes inbetween */
size_t got_size; size_t got_size;
char* buf = buffer_get_buffer(&got_size); char* buf = buffer_get_buffer(&got_size);
ALIGN_BUFFER(buf, got_size, sizeof(struct dircache_entry)); dircache_root = (struct dircache_entry*)ALIGN_UP(buf,
d_names_start = d_names_end = (char*)dircache_root + got_size - 1; sizeof(struct dircache_entry));
d_names_start = d_names_end = buf + got_size - 1;
dircache_size = 0; dircache_size = 0;
generate_dot_d_names(); generate_dot_d_names();
@ -897,8 +898,8 @@ int dircache_build(int last_size)
dot -= offset; dot -= offset;
dotdot -= offset; dotdot -= offset;
/* equivalent to dircache_size + DIRCACHE_RESERVE */ /* equivalent to dircache_size + DIRCACHE_RESERVE + align */
allocated_size = (d_names_end - (char*)dircache_root); allocated_size = (d_names_end - buf);
reserve_used = 0; reserve_used = 0;
buffer_release_buffer(allocated_size); buffer_release_buffer(allocated_size);