From e8be14e00a261f879491db2f221d84889b82e9e4 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 6 Dec 2010 07:48:14 +0000
Subject: [PATCH] minor refactoring

---
 lib/techniques/error/use.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index e74f625d5..7d766ecca 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -11,6 +11,7 @@ import re
 import time
 
 from lib.core.agent import agent
+from lib.core.common import extractRegexResult
 from lib.core.common import getUnicode
 from lib.core.common import randomInt
 from lib.core.common import replaceNewlineTabs
@@ -55,16 +56,13 @@ def errorUse(expression):
 
     payload = agent.payload(newValue=expression)
     reqBody, _ = Request.queryPage(payload, content=True)
-    match = re.search(check, reqBody, re.DOTALL | re.IGNORECASE)
+    output = extractRegexResult(check, reqBody, re.DOTALL | re.IGNORECASE)
 
-    if match:
-        output = match.group('result')
+    if output:
+        output = output.replace(ERROR_SPACE, " ").replace(ERROR_EMPTY_CHAR, "")
 
-        if output:
-            output = output.replace(ERROR_SPACE, " ").replace(ERROR_EMPTY_CHAR, "")
-
-            if conf.verbose > 0:
-                infoMsg = "retrieved: %s" % replaceNewlineTabs(output, stdout=True)
-                logger.info(infoMsg)
+        if conf.verbose > 0:
+            infoMsg = "retrieved: %s" % replaceNewlineTabs(output, stdout=True)
+            logger.info(infoMsg)
 
     return output