diff options
author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-12-16 01:38:56 +0000 |
---|---|---|
committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-12-16 01:38:56 +0000 |
commit | ecec94043d603f13374b364e634a7b3a82190ca2 (patch) | |
tree | 7c958a342b321e14faad6ee256a7ca24f6921e42 /apps | |
parent | a2aec46f04699ca00e3c18d5156b37e581d05c3f (diff) | |
download | rockbox-ecec94043d603f13374b364e634a7b3a82190ca2.tar.gz rockbox-ecec94043d603f13374b364e634a7b3a82190ca2.zip |
Check that the pointer isn't NULL before dereferencing it, just to be safe and to allow using bufgetdata to know how much data is available. Also remove a few trailing spaces.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15940 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/buffering.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 1567a6ea91..531413bcb4 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -1135,7 +1135,9 @@ ssize_t bufgetdata(int handle_id, size_t size, void **data) | |||
1135 | memcpy(guard_buffer, (unsigned char *)buffer, copy_n); | 1135 | memcpy(guard_buffer, (unsigned char *)buffer, copy_n); |
1136 | } | 1136 | } |
1137 | 1137 | ||
1138 | *data = &buffer[h->ridx]; | 1138 | if (data) |
1139 | *data = &buffer[h->ridx]; | ||
1140 | |||
1139 | return size; | 1141 | return size; |
1140 | } | 1142 | } |
1141 | 1143 | ||
@@ -1144,7 +1146,7 @@ ssize_t bufgettail(int handle_id, size_t size, void **data) | |||
1144 | size_t tidx; | 1146 | size_t tidx; |
1145 | 1147 | ||
1146 | const struct memory_handle *h; | 1148 | const struct memory_handle *h; |
1147 | 1149 | ||
1148 | h = find_handle(handle_id); | 1150 | h = find_handle(handle_id); |
1149 | 1151 | ||
1150 | if (!h) | 1152 | if (!h) |
@@ -1172,7 +1174,7 @@ ssize_t bufgettail(int handle_id, size_t size, void **data) | |||
1172 | ssize_t bufcuttail(int handle_id, size_t size) | 1174 | ssize_t bufcuttail(int handle_id, size_t size) |
1173 | { | 1175 | { |
1174 | struct memory_handle *h; | 1176 | struct memory_handle *h; |
1175 | 1177 | ||
1176 | h = find_handle(handle_id); | 1178 | h = find_handle(handle_id); |
1177 | 1179 | ||
1178 | if (!h) | 1180 | if (!h) |