Merge branch 'master' of https://github.com/devttys0/binwalk

deps.sh

@@ -145,7 +145,7 @@ fi
 
 # Do the install(s)
 cd /tmp
-sudo $PKGCMD $PKGCMD_OPTS $PKG_CANDIDATES
+$SUDO $PKGCMD $PKGCMD_OPTS $PKG_CANDIDATES
 if [ $? -ne 0 ]
     then
     echo "Package installation failed: $PKG_CANDIDATES"

src/binwalk/modules/extractor.py

@@ -695,8 +695,10 @@ class Extractor(Module):
                 if not data:
                     break
                 else:
-                    fdout.write(str2bytes(data[adjust:dlen]))
                     total_size += (dlen-adjust)
+                    if total_size > size:
+                        dlen -= (total_size - size)
+                    fdout.write(str2bytes(data[adjust:dlen]))
                     adjust = 0
 
             # Cleanup