[FEATURE] Added masking values to DWORD

Author: hasherezade

parser/include/bearparser/AbstractByteBuffer.h

@@ -6,18 +6,22 @@
 
 #include <QtCore>
 
-#include <iostream>
 #include <stdlib.h>
-
 //------------------------------------------------
 
+#define MAX_DWORD 0xffffffff
+#define MAX_WORD 0xffff
+#define MASK_TO_DWORD(val) ((val < MAX_DWORD) ? (val & MAX_DWORD) : MAX_DWORD)
+#define MASK_TO_WORD(val) ((val < MAX_WORD) ? (val & MAX_WORD) : MAX_WORD)
+
 typedef uint32_t bufsize_t;
 const bufsize_t BUFSIZE_MAX = bufsize_t(-1);
 
 typedef uint64_t offset_t;
 const offset_t INVALID_ADDR = offset_t(-1);
 const offset_t  OFFSET_MAX = (INVALID_ADDR - 1);
 
+
 class BufferException : public CustomException
 {
 public:

parser/include/bearparser/pe/PECore.h

@@ -18,7 +18,7 @@ class PECore
 
     bool wrap(AbstractByteBuffer *v_buf);
 
-    virtual offset_t getRawSize() const { return static_cast<offset_t>(buf->getContentSize()); }
+    virtual offset_t getRawSize() const { return buf ? static_cast<offset_t>(buf->getContentSize()) : 0; }
 
     virtual bufsize_t getAlignment(Executable::addr_type aType) const;
     virtual offset_t getImageBase(bool recalculate = false);
@@ -35,11 +35,11 @@ class PECore
 
     void setImageSize(bufsize_t newSize)
     {
-        if (opt32) {
-            this->opt32->SizeOfImage = newSize;
+        if (this->opt32) {
+            this->opt32->SizeOfImage = MASK_TO_DWORD(newSize);
         }
-        else if (opt64) {
-            this->opt64->SizeOfImage = newSize;
+        else if (this->opt64) {
+            this->opt64->SizeOfImage = MASK_TO_DWORD(newSize);
         }
     }
 

parser/pe/PEFile.cpp

@@ -558,8 +558,8 @@ SectionHdrWrapper* PEFile::addNewSection(QString name, bufsize_t r_size, bufsize
         }
         secHdr.PointerToRawData = static_cast<DWORD>(roundedRawEnd);
         secHdr.VirtualAddress = static_cast<DWORD>(roundedVirtualEnd);
-        secHdr.SizeOfRawData = r_size;
-        secHdr.Misc.VirtualSize = v_size;
+        secHdr.SizeOfRawData = MASK_TO_DWORD(r_size);
+        secHdr.Misc.VirtualSize = MASK_TO_DWORD(v_size);
 
         SectionHdrWrapper wr(this, &secHdr);
         secHdrWr = dynamic_cast<SectionHdrWrapper*>(sec->addEntry(&wr));