Fixed --base bug; --base now only affects the displayed offsets

src/binwalk/core/module.py

@@ -326,7 +326,13 @@ class Module(object):
                 result = self.RESULT
 
             for name in result:
-                args.append(getattr(r, name))
+                value = getattr(r, name)
+
+                # Displayed offsets should be offset by the base address
+                if name == 'offset':
+                    value += self.config.base
+
+                args.append(value)
 
         return args
 
@@ -396,9 +402,6 @@ class Module(object):
         # Add the name of the current module to the result
         r.module = self.__class__.__name__
 
-        # Add any specified base address to the reported offset
-        r.offset += self.config.base
-
         # Any module that is reporting results, valid or not, should be marked as enabled
         if not self.enabled:
             self.enabled = True

src/binwalk/modules/extractor.py

@@ -517,8 +517,8 @@ class Extractor(Module):
         Returns the extracted file name.
         '''
         total_size = 0
-        # Default extracted file name is <hex offset>.<extension>
-        default_bname = "%X" % offset
+        # Default extracted file name is <displayed hex offset>.<extension>
+        default_bname = "%X" % (offset + self.config.base)
 
         if self.max_size and size > self.max_size:
             size = self.max_size