zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix range check bug in FileList::seek() (#13286)

Browse source 
When `count()` returns 0, `pos > (count()-1)` will always yield `true` due to integer underflow.
This commit is contained in:
Tobias Frost 2019-03-02 23:43:08 +01:00 committed by Scott Lahteine
parent 05c2f80826
commit 57afd0ab37
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -688,7 +688,7 @@ namespace ExtUI {
bool FileList::seek(const uint16_t pos, const bool skip_range_check) { bool FileList::seek(const uint16_t pos, const bool skip_range_check) {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
if (!skip_range_check && pos > (count() - 1)) return false; if (!skip_range_check && (pos + 1) > count()) return false;
const uint16_t nr = const uint16_t nr =
#if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA) #if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)
count() - 1 - count() - 1 -