From a5ffa62013146000f933d5228cb428ee82c35978 Mon Sep 17 00:00:00 2001
From: Rafael Caricio <rafael@caricio.com>
Date: Mon, 24 May 2021 23:14:15 +0200
Subject: [PATCH] lv_mem_monitor_t is not allocated by lv_mem_monitor function,
 we need to pass pointer to a valid memory address

---
 lvgl/src/mem.rs | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lvgl/src/mem.rs b/lvgl/src/mem.rs
index 926cc3c..55ca9f6 100644
--- a/lvgl/src/mem.rs
+++ b/lvgl/src/mem.rs
@@ -71,7 +71,6 @@ impl<T> AsMut<T> for Box<T> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use core::mem::MaybeUninit;
     use std::sync::Once;
     use std::vec::Vec;
 
@@ -108,8 +107,7 @@ mod test {
             disp: i32,
         }
 
-        print_mem_info();
-        let total_mem_available_initially = get_mem_info().free_size;
+        let initial_mem_info = mem_info();
 
         let mut keep = Vec::new();
         for i in 0..100 {
@@ -122,7 +120,8 @@ mod test {
 
             println!("{:?}", p);
             let mut b = Box::new(p).unwrap_or_else(|_| {
-                print_mem_info();
+                let info = mem_info();
+                println!("mem info: {:?}", &info);
                 panic!("OOM");
             });
 
@@ -130,40 +129,41 @@ mod test {
 
             let point = b.as_mut();
             if point.x != i {
-                print_mem_info();
-
                 println!("{:?}", point);
             }
             assert_eq!(point.x, i);
 
-            print_mem_info();
+            let info = mem_info();
+            println!("mem info: {:?}", &info);
             keep.push(b);
         }
         drop(keep);
 
-        print_mem_info();
         unsafe {
             lvgl_sys::lv_mem_defrag();
         }
-        print_mem_info();
+
+        let final_info = mem_info();
+        println!("mem info: {:?}", &final_info);
 
         // If this fails, we are leaking memory! BOOM! \o/
-        assert_eq!(total_mem_available_initially, get_mem_info().free_size)
+        assert_eq!(initial_mem_info.free_size, final_info.free_size)
     }
 
-    fn get_mem_info() -> lvgl_sys::lv_mem_monitor_t {
-        let mut info: MaybeUninit<lvgl_sys::lv_mem_monitor_t> = MaybeUninit::uninit();
+    fn mem_info() -> lvgl_sys::lv_mem_monitor_t {
+        let mut info = lvgl_sys::lv_mem_monitor_t {
+            total_size: 0,
+            free_cnt: 0,
+            free_size: 0,
+            free_biggest_size: 0,
+            used_cnt: 0,
+            max_used: 0,
+            used_pct: 0,
+            frag_pct: 0
+        };
         unsafe {
-            lvgl_sys::lv_mem_monitor(info.as_mut_ptr());
+            lvgl_sys::lv_mem_monitor(&mut info as *mut _);
         }
-        if !info.as_ptr().is_null() {
-            unsafe { info.assume_init() }
-        } else {
-            panic!("Could not get memory info from LVGL! :(");
-        }
-    }
-
-    fn print_mem_info() {
-        println!("mem info: {:?}", get_mem_info());
+        info
     }
 }