Merge branch 'master' of github.com:sqlmapproject/sqlmap

bdamele · bdamele · commit 204ee1db399a · 2015-03-19T12:06:36.000Z
diff --git a/thirdparty/magic/magic.py b/thirdparty/magic/magic.py
@@ -111,7 +111,10 @@ def from_buffer(buffer, mime=False):
 
     # This is necessary because find_library returns None if it doesn't find the library
     if dll:
-        libmagic = ctypes.CDLL(dll)
+        try:
+            libmagic = ctypes.CDLL(dll)
+        except WindowsError:
+            pass
 
     if not libmagic or not libmagic._name:
         import sys
