CI updates

src/packhead.h

@@ -39,12 +39,13 @@ struct PackHeader final {
     ~PackHeader() noexcept = default;
 
     void reset() noexcept;
+    int set_method(int m, unsigned offset = 0); // check, then assign
+
+    int getPackHeaderSize() const;
 
     void putPackHeader(SPAN_S(byte) p) const;
     bool decodePackHeaderFromBuf(SPAN_S(const byte) b, int blen);
 
-    int getPackHeaderSize() const;
-
     // fields stored in compressed file => see stub/src/include/header.S
     // enum { magic = UPX_MAGIC_LE32 };
     int version;
@@ -63,7 +64,6 @@ struct PackHeader final {
         int n_mru;       // specific name for filter ctojr
     };
     int header_checksum;
-    int set_method(int m, unsigned offset = 0); // check, then assign
 
     // support fields for verifying decompression
     unsigned saved_u_adler;

src/pefile.h

@@ -529,7 +529,7 @@ protected:
     };
     enum { IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS = 20 };
     enum { IMAGE_DLLCHARACTERISTICS_EX_CET_COMPAT = 0x001 };
-    struct DebugDir *dbgCET;
+    struct DebugDir *dbgCET = nullptr;
 };
 
 class PeFile32 : public PeFile {

src/work.cpp

@@ -329,19 +329,21 @@ void do_one_file(const char *const iname, char *const oname) may_throw {
     }
 
     // handle command - actual work starts HERE
-    PackMaster pm(&fi, opt);
-    if (opt->cmd == CMD_COMPRESS)
-        pm.pack(&fo);
-    else if (opt->cmd == CMD_DECOMPRESS)
-        pm.unpack(&fo);
-    else if (opt->cmd == CMD_TEST)
-        pm.test();
-    else if (opt->cmd == CMD_LIST)
-        pm.list();
-    else if (opt->cmd == CMD_FILEINFO)
-        pm.fileInfo();
-    else
-        throwInternalError("invalid command");
+    {
+        PackMaster pm(&fi, opt);
+        if (opt->cmd == CMD_COMPRESS)
+            pm.pack(&fo);
+        else if (opt->cmd == CMD_DECOMPRESS)
+            pm.unpack(&fo);
+        else if (opt->cmd == CMD_TEST)
+            pm.test();
+        else if (opt->cmd == CMD_LIST)
+            pm.list();
+        else if (opt->cmd == CMD_FILEINFO)
+            pm.fileInfo();
+        else
+            throwInternalError("invalid command");
+    }
 
     // copy time stamp
     if (oname[0] && opt->preserve_timestamp && fo.isOpen())