Merge pull request #85 from Zondax/hotfix_ledger

Hotfix. Improving support for new firmware/SDK
Zondax · Nov 21, 2021 · a36edc7 · a36edc7
2 parents c265a4d + 8c11c8b
commit a36edc7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmake/gtest/CMakeLists.txt.gtest.in b/cmake/gtest/CMakeLists.txt.gtest.in
@@ -6,7 +6,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG master
+        GIT_TAG release-1.11.0
         SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
         BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
         CONFIGURE_COMMAND ""

diff --git a/deps/ledger-zxlib/app/common/view.c b/deps/ledger-zxlib/app/common/view.c
@@ -70,6 +70,7 @@ void h_paging_init() {
     viewdata.itemIdx = 0;
     viewdata.pageIdx = 0;
     viewdata.pageCount = 1;
+    viewdata.itemCount = 0xFF;
 }
 
 bool h_paging_can_increase() {
@@ -185,6 +186,11 @@ zxerr_t h_review_update_data() {
         return zxerr_no_data;
     }
 
+    if (viewdata.viewfuncGetItem == NULL) {
+        zemu_log_stack("h_review_update_data - GetItem==NULL");
+        return zxerr_no_data;
+    }
+
     char buffer[20];
     snprintf(buffer, sizeof(buffer), "update Idx %d/%d", viewdata.itemIdx, viewdata.pageIdx);
     zemu_log_stack(buffer);