fix some issues found by CodeQL

Neverous · Jul 29, 2023 · 48ea88c · 48ea88c
1 parent 721f0b6
commit 48ea88c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/include/efiboot.h b/include/efiboot.h
@@ -610,8 +610,7 @@ inline std::optional<Load_option> deserialize(const void *data, size_t data_size
 
     uint8_t *optional_data = nullptr;
     size_t optional_data_size = 0;
-    int ret = efi_loadopt_optional_data(load_option, data_size, &optional_data, &optional_data_size);
-    if(ret >= 0)
+    if(int ret = efi_loadopt_optional_data(load_option, data_size, &optional_data, &optional_data_size); ret >= 0)
     {
         auto opt_data = deserialize<Raw_data>(optional_data, optional_data_size);
         if(!opt_data)

diff --git a/include/efibooteditorcli.h b/include/efibooteditorcli.h
@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
+#pragma once
+
 #include <QCommandLineParser>
 #include <QCoreApplication>
 

diff --git a/include/efivar-lite/efivar.h b/include/efivar-lite/efivar.h
@@ -15,9 +15,9 @@
 typedef struct ATTR_ALIGN(1)
 {
 #if defined(_WIN32)
-    TCHAR data[39];
+    const TCHAR *data;
 #elif defined(__APPLE__)
-    char data[37];
+    const char *data;
 #else
     uint32_t a;
     uint16_t b;

diff --git a/src/efivar-lite.common.h b/src/efivar-lite.common.h
@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
+#pragma once
+
 #include <stdarg.h>
 #include <stdint.h>
 #include <string.h>