Commit 4f1533f0 by devttys0

Partial fix for entropy bugs in Windows

parent a9a8c7ef
......@@ -117,9 +117,16 @@ class Entropy(Module):
# Need to invoke the pyqtgraph stuff via a separate process, as calling pg.exit
# is pretty much required. pg.exit calls os._exit though, and we don't want to
# exit out of the main process (especially if being run via the API).
p = multiprocessing.Process(target=self._run)
p.start()
p.join()
try:
p = multiprocessing.Process(target=self._run)
p.start()
p.join()
except IOError as e:
# Windows Python2.7 imp.find_module fails to find the binwalk module;
# this eventually leads to an Invalid Argument IOError in the multiprocessing
# module. This means that when run in Windows, pg.exit will cause binwalk
# to exit.
self._run()
def _run(self):
# Sanity check and warning if pyqtgraph isn't found
......
# This file has been depreciated and is no longer in use.
# This is merely a placeholder to ensure future installations
# don't leave the old, depreciated file in tact.
import binwalk.core.plugin
class Unjffs2DepreciatedPlugin(binwalk.core.plugin.Plugin):
pass
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment