minor patch

stamparm · stamparm · commit 5f7dbec41f52 · 2011-12-03T12:11:46.000Z
diff --git a/doc/THANKS b/doc/THANKS
@@ -621,7 +621,7 @@ mariano <marianoso@gmail.com>
     for reporting a bug
 
 mitchell <mitchell@tufala.net>
-    for reporting a bug
+    for reporting a few bugs
 
 Nadzree <nadzree@bake180.com>
     for reporting a minor bug
diff --git a/lib/core/target.py b/lib/core/target.py
@@ -212,48 +212,52 @@ def __setOutputResume():
 
     if os.path.exists(conf.sessionFile):
         if not conf.flushSession:
-            readSessionFP = codecs.open(conf.sessionFile, "r", UNICODE_ENCODING, 'replace')
-            __url_cache = set()
-            __expression_cache = {}
-
-            for line in readSessionFP.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
-                if line.count("][") == 4:
-                    line = line.split("][")
+            try:
+                readSessionFP = codecs.open(conf.sessionFile, "r", UNICODE_ENCODING, 'replace')
+                __url_cache = set()
+                __expression_cache = {}
 
-                    if len(line) != 5:
-                        continue
+                for line in readSessionFP.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
+                    if line.count("][") == 4:
+                        line = line.split("][")
 
-                    url, _, _, expression, value = line
+                        if len(line) != 5:
+                            continue
 
-                    if not value:
-                        continue
+                        url, _, _, expression, value = line
 
-                    if url[0] == "[":
-                        url = url[1:]
+                        if not value:
+                            continue
 
-                    value = value.rstrip('\r\n') # Strips both chars independently
+                        if url[0] == "[":
+                            url = url[1:]
 
-                    if url not in ( conf.url, conf.hostname ):
-                        continue
+                        value = value.rstrip('\r\n') # Strips both chars independently
 
-                    if url not in __url_cache:
-                        kb.resumedQueries[url] = {}
-                        kb.resumedQueries[url][expression] = value
-                        __url_cache.add(url)
-                        __expression_cache[url] = set(expression)
+                        if url not in ( conf.url, conf.hostname ):
+                            continue
 
-                    resumeConfKb(expression, url, value)
+                        if url not in __url_cache:
+                            kb.resumedQueries[url] = {}
+                            kb.resumedQueries[url][expression] = value
+                            __url_cache.add(url)
+                            __expression_cache[url] = set(expression)
 
-                    if expression not in __expression_cache[url]:
-                        kb.resumedQueries[url][expression] = value
-                        __expression_cache[url].add(value)
-                    elif len(value) >= len(kb.resumedQueries[url][expression]):
-                        kb.resumedQueries[url][expression] = value
+                        resumeConfKb(expression, url, value)
 
-            if kb.injection.place is not None and kb.injection.parameter is not None:
-                kb.injections.append(kb.injection)
+                        if expression not in __expression_cache[url]:
+                            kb.resumedQueries[url][expression] = value
+                            __expression_cache[url].add(value)
+                        elif len(value) >= len(kb.resumedQueries[url][expression]):
+                            kb.resumedQueries[url][expression] = value
 
-            readSessionFP.close()
+                if kb.injection.place is not None and kb.injection.parameter is not None:
+                    kb.injections.append(kb.injection)
+            except IOError, msg:
+                errMsg = "unable to properly open the session file (%s)" % msg
+                raise sqlmapFilePathException, errMsg
+            else:
+                readSessionFP.close()
         else:
             try:
                 os.remove(conf.sessionFile)
