Minor fix (user reported problem via email)

stamparm · stamparm · commit 27ebc025354e · 2014-05-29T09:33:14.000+02:00
diff --git a/lib/core/convert.py b/lib/core/convert.py
@@ -48,7 +48,11 @@ def base64pickle(value):
         warnMsg += "instance of a type '%s'" % type(value)
         singleTimeWarnMessage(warnMsg)
 
-        retVal = base64encode(pickle.dumps(str(value), pickle.HIGHEST_PROTOCOL))
+        try:
+            retVal = base64encode(pickle.dumps(value))
+        except:
+            retVal = base64encode(pickle.dumps(str(value), pickle.HIGHEST_PROTOCOL))
+
     return retVal
 
 def base64unpickle(value):
diff --git a/lib/core/target.py b/lib/core/target.py
@@ -25,6 +25,7 @@
 from lib.core.data import logger
 from lib.core.data import mergedOptions
 from lib.core.data import paths
+from lib.core.datatype import InjectionDict
 from lib.core.dicts import DBMS_DICT
 from lib.core.dump import dumper
 from lib.core.enums import HASHDB_KEYS
@@ -345,7 +346,7 @@ def _resumeHashDBValues():
     conf.tmpPath = conf.tmpPath or hashDBRetrieve(HASHDB_KEYS.CONF_TMP_PATH)
 
     for injection in hashDBRetrieve(HASHDB_KEYS.KB_INJECTIONS, True) or []:
-        if injection.place in conf.paramDict and \
+        if isinstance(injection, InjectionDict) and injection.place in conf.paramDict and \
             injection.parameter in conf.paramDict[injection.place]:
 
             if not conf.tech or intersect(conf.tech, injection.data.keys()):
