From 3d9da6b82b9dedf3c41019c50ef3223750f678d9 Mon Sep 17 00:00:00 2001 From: Fernando Theirs Date: Fri, 19 Nov 2021 17:05:50 -0300 Subject: [PATCH 1/2] initialize itemCount and null check --- deps/ledger-zxlib/app/common/view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deps/ledger-zxlib/app/common/view.c b/deps/ledger-zxlib/app/common/view.c index 2496f4f6..6fda9e4b 100644 --- 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); From 8c11c8b894a04a62c1c1cadebfe21dca3d048656 Mon Sep 17 00:00:00 2001 From: Fernando Theirs Date: Fri, 19 Nov 2021 17:11:31 -0300 Subject: [PATCH 2/2] update googletest tag --- cmake/gtest/CMakeLists.txt.gtest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/gtest/CMakeLists.txt.gtest.in b/cmake/gtest/CMakeLists.txt.gtest.in index 202d3c3d..cd4ae6c7 100644 --- 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 ""