From e4adb45ed25b927d4c1fa0ed688f0387c2e319c1 Mon Sep 17 00:00:00 2001
From: bird_egop <sampletext32@bk.ru>
Date: Sat, 12 Apr 2025 17:20:51 +0300
Subject: [PATCH] Move section code checking logic from SectionHeaderParser to
 SectionHeader class

---
 X86Disassembler/PE/PEFormat.cs                |  4 +-
 .../PE/Parsers/SectionHeaderParser.cs         | 14 ------
 X86Disassembler/PE/SectionHeader.cs           | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/X86Disassembler/PE/PEFormat.cs b/X86Disassembler/PE/PEFormat.cs
index 257281f..bd41bfc 100644
--- a/X86Disassembler/PE/PEFormat.cs
+++ b/X86Disassembler/PE/PEFormat.cs
@@ -203,7 +203,7 @@ namespace X86Disassembler.PE
             
             for (int i = 0; i < SectionHeaders.Count; i++)
             {
-                if (_sectionHeaderParser.IsSectionContainsCode(SectionHeaders[i]))
+                if (SectionHeaders[i].ContainsCode())
                 {
                     codeSections.Add(i);
                 }
@@ -219,7 +219,7 @@ namespace X86Disassembler.PE
         /// <returns>True if the section contains code, false otherwise</returns>
         public bool IsSectionContainsCode(SectionHeader section)
         {
-            return _sectionHeaderParser.IsSectionContainsCode(section);
+            return section.ContainsCode();
         }
     }
 }
diff --git a/X86Disassembler/PE/Parsers/SectionHeaderParser.cs b/X86Disassembler/PE/Parsers/SectionHeaderParser.cs
index 74df093..8106c65 100644
--- a/X86Disassembler/PE/Parsers/SectionHeaderParser.cs
+++ b/X86Disassembler/PE/Parsers/SectionHeaderParser.cs
@@ -34,19 +34,5 @@ namespace X86Disassembler.PE.Parsers
             
             return header;
         }
-        
-        /// <summary>
-        /// Checks if a section contains code
-        /// </summary>
-        /// <param name="section">The section to check</param>
-        /// <returns>True if the section contains code, false otherwise</returns>
-        public bool IsSectionContainsCode(SectionHeader section)
-        {
-            const uint IMAGE_SCN_CNT_CODE = 0x00000020;     // Section contains code
-            const uint IMAGE_SCN_MEM_EXECUTE = 0x20000000;   // Section is executable
-            
-            return (section.Characteristics & IMAGE_SCN_CNT_CODE) != 0 ||
-                   (section.Characteristics & IMAGE_SCN_MEM_EXECUTE) != 0;
-        }
     }
 }
diff --git a/X86Disassembler/PE/SectionHeader.cs b/X86Disassembler/PE/SectionHeader.cs
index 7eac445..a18c929 100644
--- a/X86Disassembler/PE/SectionHeader.cs
+++ b/X86Disassembler/PE/SectionHeader.cs
@@ -5,6 +5,12 @@ namespace X86Disassembler.PE
     /// </summary>
     public class SectionHeader
     {
+        // Section characteristics flags
+        private const uint IMAGE_SCN_CNT_CODE = 0x00000020;     // Section contains code
+        private const uint IMAGE_SCN_MEM_EXECUTE = 0x20000000;   // Section is executable
+        private const uint IMAGE_SCN_MEM_READ = 0x40000000;      // Section is readable
+        private const uint IMAGE_SCN_MEM_WRITE = 0x80000000;     // Section is writable
+        
         public string Name;                 // Section name
         public uint VirtualSize;           // Virtual size
         public uint VirtualAddress;        // Virtual address
@@ -15,5 +21,42 @@ namespace X86Disassembler.PE
         public ushort NumberOfRelocations; // Number of relocations
         public ushort NumberOfLinenumbers; // Number of line numbers
         public uint Characteristics;       // Characteristics
+        
+        /// <summary>
+        /// Checks if the section contains code
+        /// </summary>
+        /// <returns>True if the section contains code, false otherwise</returns>
+        public bool ContainsCode()
+        {
+            return (Characteristics & IMAGE_SCN_CNT_CODE) != 0 ||
+                   (Characteristics & IMAGE_SCN_MEM_EXECUTE) != 0;
+        }
+        
+        /// <summary>
+        /// Checks if the section is readable
+        /// </summary>
+        /// <returns>True if the section is readable, false otherwise</returns>
+        public bool IsReadable()
+        {
+            return (Characteristics & IMAGE_SCN_MEM_READ) != 0;
+        }
+        
+        /// <summary>
+        /// Checks if the section is writable
+        /// </summary>
+        /// <returns>True if the section is writable, false otherwise</returns>
+        public bool IsWritable()
+        {
+            return (Characteristics & IMAGE_SCN_MEM_WRITE) != 0;
+        }
+        
+        /// <summary>
+        /// Checks if the section is executable
+        /// </summary>
+        /// <returns>True if the section is executable, false otherwise</returns>
+        public bool IsExecutable()
+        {
+            return (Characteristics & IMAGE_SCN_MEM_EXECUTE) != 0;
+        }
     }
 }