diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-10-07 19:29:18 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-10-07 19:29:18 +0000 |
commit | 5783505b99eeb53c271d2437153a5e4a7f278d4d (patch) | |
tree | 79033b5d423d5a0cbc3dcce4ce0e8aa423b124c7 /firmware/font.c | |
parent | 42a33a7f70de01b64e2430dc1c989a2937126818 (diff) | |
download | rockbox-5783505b99eeb53c271d2437153a5e4a7f278d4d.tar.gz rockbox-5783505b99eeb53c271d2437153a5e4a7f278d4d.zip |
Add two macros for char*-based pointer arithmetic and use it in font.c
This fixes errornous pointer addition (+ on a short*), which crashed in some situation.
Fixes FS#12317 and should hopefully get the clips booting again.
Thanks to Jonathan Gordon for spotting the bad pointer arithmetic.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30724 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/font.c')
-rw-r--r-- | firmware/font.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/firmware/font.c b/firmware/font.c index 0546061a15..8cd9be1ad5 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -88,26 +88,23 @@ static int buflibmove_callback(int handle, void* current, void* new) | |||
88 | { | 88 | { |
89 | (void)handle; | 89 | (void)handle; |
90 | struct buflib_alloc_data *alloc = (struct buflib_alloc_data*)current; | 90 | struct buflib_alloc_data *alloc = (struct buflib_alloc_data*)current; |
91 | size_t diff = new - current; | 91 | ptrdiff_t diff = new - current; |
92 | 92 | ||
93 | if (alloc->handle_locked) | 93 | if (alloc->handle_locked) |
94 | return BUFLIB_CB_CANNOT_MOVE; | 94 | return BUFLIB_CB_CANNOT_MOVE; |
95 | 95 | ||
96 | if (alloc->font.bits) | 96 | #define UPDATE(x) if (x) { x = PTR_ADD(x, diff); } |
97 | alloc->font.bits += diff; | 97 | |
98 | if (alloc->font.offset) | 98 | UPDATE(alloc->font.bits); |
99 | alloc->font.offset += diff; | 99 | UPDATE(alloc->font.offset); |
100 | if (alloc->font.width) | 100 | UPDATE(alloc->font.width); |
101 | alloc->font.width += diff; | 101 | |
102 | 102 | UPDATE(alloc->font.buffer_start); | |
103 | alloc->font.buffer_start += diff; | 103 | UPDATE(alloc->font.buffer_end); |
104 | alloc->font.buffer_end += diff; | 104 | UPDATE(alloc->font.buffer_position); |
105 | alloc->font.buffer_position += diff; | 105 | |
106 | 106 | UPDATE(alloc->font.cache._index); | |
107 | if (alloc->font.cache._index) | 107 | UPDATE(alloc->font.cache._lru._base); |
108 | alloc->font.cache._index += diff; | ||
109 | if (alloc->font.cache._lru._base) | ||
110 | alloc->font.cache._lru._base += diff; | ||
111 | 108 | ||
112 | return BUFLIB_CB_OK; | 109 | return BUFLIB_CB_OK; |
113 | } | 110 | } |