From 9331abb96f4e70b5ae5a5bee42f5273b05f704d3 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sat, 11 Jun 2011 08:33:36 +0000
Subject: [PATCH] minor update

---
 lib/controller/checks.py | 1 +
 lib/core/option.py       | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 2dfa910d6..cfa1bfa39 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -459,6 +459,7 @@ def checkSqlInjection(place, parameter, value):
                         injection.data[stype].matchRatio = kb.matchRatio
 
                         injection.conf.textOnly = conf.textOnly
+                        injection.conf.titles = conf.titles
                         injection.conf.string = conf.string
                         injection.conf.regexp = conf.regexp
 
diff --git a/lib/core/option.py b/lib/core/option.py
index 9ef45841e..702fa7049 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1260,7 +1260,7 @@ def __cleanupOptions():
     if conf.optimize:
         #conf.predictOutput = True
         conf.keepAlive = True
-        conf.nullConnection = not conf.textOnly
+        conf.nullConnection = not any([conf.textOnly, conf.titles])
         conf.threads = 3 if conf.threads < 3 else conf.threads
 
     if conf.data:
@@ -1272,7 +1272,7 @@ def __cleanupOptions():
     if conf.dbms:
         conf.dbms = conf.dbms.capitalize()
 
-    if conf.optimize and any([conf.data, conf.textOnly]):
+    if conf.optimize and any([conf.data, conf.textOnly, conf.titles]):
         conf.nullConnection = False
 
         debugMsg = "turning off --null-connection switch used indirectly by switch -o"
@@ -1668,6 +1668,10 @@ def __basicOptionValidation():
         errMsg = "switch --text-only is incompatible with switch --null-connection"
         raise sqlmapSyntaxException, errMsg
 
+    if conf.titles and conf.nullConnection:
+        errMsg = "switch --titles is incompatible with switch --null-connection"
+        raise sqlmapSyntaxException, errMsg
+
     if conf.data and conf.nullConnection:
         errMsg = "switch --data is incompatible with switch --null-connection"
         raise sqlmapSyntaxException, errMsg