Remove CodeQL warnings

Changes made according to the latest version of zxlib.
vacuumlabs · Jan 4, 2024 · 1c872ea · 1c872ea
1 parent 45b3c7b
commit 1c872ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/deps/ledger-zxlib/app/ui/view_nano_inspect.c b/deps/ledger-zxlib/app/ui/view_nano_inspect.c
@@ -41,14 +41,12 @@ void view_inspect_init(viewfunc_getInnerItem_t view_funcGetInnerItem,
 }
 
 bool h_paging_inspect_go_to_root_screen() {
-    return (viewdata.innerField.level >= 0) &&
-           (viewdata.innerField.paging.itemIdx == 0)
+    return (viewdata.innerField.paging.itemIdx == 0)
            && (viewdata.innerField.trace[0] != 0);
 }
 
 bool h_paging_inspect_back_screen() {
-    return (viewdata.innerField.level >= 0) &&
-           (viewdata.innerField.paging.itemIdx == (viewdata.innerField.paging.itemCount - 1))
+    return (viewdata.innerField.paging.itemIdx == (viewdata.innerField.paging.itemCount - 1))
             && (viewdata.innerField.trace[0] != 0);
 }
 

diff --git a/deps/ledger-zxlib/include/utf8.h b/deps/ledger-zxlib/include/utf8.h
@@ -700,7 +700,7 @@ utf8_int8_t *c = utf8_null;
 size_t bytes = 0;
 
 /* Find the end of the string or stop when n is reached */
-while ('\0' != src[bytes] && bytes < n) {
+while (bytes < n && '\0' != src[bytes]) {
 bytes++;
 }
 
@@ -722,7 +722,7 @@ return utf8_null;
 bytes = 0;
 
 /* copy src byte-by-byte into our new utf8 string */
-while ('\0' != src[bytes] && bytes < n) {
+while (bytes < n && '\0' != src[bytes]) {
 c[bytes] = src[bytes];
 bytes++;
 }