From 96a033b51d8fa856640e20e59b546ccc6a420093 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 3 Jan 2010 15:56:29 +0000
Subject: [PATCH] found and fixed few bugs regarding my "fix" of Bug #110

---
 lib/request/basic.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/request/basic.py b/lib/request/basic.py
index 1b5f1a8a4..2bf8a8b80 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -68,13 +68,13 @@ def parseResponse(page, headers):
         # Detect injectable page absolute system path
         # NOTE: this regular expression works if the remote web application
         # is written in PHP and debug/error messages are enabled.
-        absFilePathsRegExp = ( r" in <b>(.*?)</b> on line",  r"\b[A-Za-z]:(\\[\w.\\]*)?", r"/[/\w.]+" )
+        absFilePathsRegExp = ( r" in <b>(?P<result>.*?)</b> on line",  r"\b(?P<result>[A-Za-z]:(\\[\w.\\]*)?)", r"(\A|[^<])(?P<result>/[/\w.]+)" )
 
         for absFilePathRegExp in absFilePathsRegExp:
             reobj = re.compile(absFilePathRegExp)
 
             for match in reobj.finditer(page):
-                absFilePath = match.group()
+                absFilePath = match.group("result")
 
                 if absFilePath not in kb.absFilePaths:
                     kb.absFilePaths.add(os.path.dirname(absFilePath))