summaryrefslogtreecommitdiff
path: root/firmware/usbstack/usb_storage.c
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2011-10-21 18:51:19 +0000
committerThomas Jarosch <tomj@simonv.com>2011-10-21 18:51:19 +0000
commiteb97426c76a0716fbc26e0581ccaaad2426d5c04 (patch)
tree3ad3c2a4e0822a23f27bb55e6893717f826e177c /firmware/usbstack/usb_storage.c
parent04a015dde0f7edfe5ee913dc8cc6c1395dc9a419 (diff)
downloadrockbox-eb97426c76a0716fbc26e0581ccaaad2426d5c04.tar.gz
rockbox-eb97426c76a0716fbc26e0581ccaaad2426d5c04.zip
Use array index 'i' only -after- bounds check
Reported by cppcheck git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30815 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack/usb_storage.c')
-rw-r--r--firmware/usbstack/usb_storage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 8203ad4177..c5fa47fa51 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -343,7 +343,7 @@ static void yearday_to_daymonth(int yd, int y, int *d, int *m)
343 t=tnl; 343 t=tnl;
344 } 344 }
345 345
346 while(yd >= t[i] && i<12) 346 while(i<12 && yd >= t[i])
347 { 347 {
348 yd-=t[i]; 348 yd-=t[i];
349 i++; 349 i++;
@@ -1233,7 +1233,7 @@ static void send_csw(int status)
1233static void copy_padded(char *dest, char *src, int len) 1233static void copy_padded(char *dest, char *src, int len)
1234{ 1234{
1235 int i=0; 1235 int i=0;
1236 while(src[i]!=0 && i<len) 1236 while(i<len && src[i]!=0)
1237 { 1237 {
1238 dest[i]=src[i]; 1238 dest[i]=src[i];
1239 i++; 1239 i++;