From 46a34e19bc527ed1da078f401df78d52cce0bfa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=8B=E9=A1=B5?= <a1364259@163.com>
Date: Wed, 31 Jul 2024 13:52:30 +0800
Subject: [PATCH] Check vendor boot ramdisk table size

---
 native/src/boot/bootimg.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/native/src/boot/bootimg.cpp b/native/src/boot/bootimg.cpp
index 29d14a3cb..1fa821c29 100644
--- a/native/src/boot/bootimg.cpp
+++ b/native/src/boot/bootimg.cpp
@@ -462,7 +462,7 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
         fprintf(stderr, "%-*s [%s]\n", PADDING, "KERNEL_FMT", fmt2name[k_fmt]);
     }
     if (auto size = hdr->ramdisk_size()) {
-        if (vendor_ramdisk_table != nullptr) {
+        if (hdr->vendor_ramdisk_table_size()) {
             // v4 vendor boot contains multiple ramdisks
             using table_entry = const vendor_ramdisk_table_entry_v4;
             if (hdr->vendor_ramdisk_table_entry_size() != sizeof(table_entry)) {
@@ -581,7 +581,7 @@ int unpack(const char *image, bool skip_decomp, bool hdr) {
     dump(boot.kernel_dtb.buf(), boot.kernel_dtb.sz(), KER_DTB_FILE);
 
     // Dump ramdisk
-    if (boot.vendor_ramdisk_table != nullptr) {
+    if (boot.hdr->vendor_ramdisk_table_size()) {
         using table_entry = const vendor_ramdisk_table_entry_v4;
         span<table_entry> table(
                 reinterpret_cast<table_entry *>(boot.vendor_ramdisk_table),
@@ -754,7 +754,7 @@ void repack(const char *src_img, const char *out_img, bool skip_comp) {
     using table_entry = vendor_ramdisk_table_entry_v4;
     vector<table_entry> ramdisk_table;
 
-    if (boot.vendor_ramdisk_table) {
+    if (boot.hdr->vendor_ramdisk_table_size()) {
         // Create a copy so we can modify it
         auto entry_start = reinterpret_cast<const table_entry *>(boot.vendor_ramdisk_table);
         ramdisk_table.insert(