fixes for bugs reported by pragmatk@gmail.com

doc/THANKS

@@ -429,6 +429,9 @@ pacman730 <pacman730@users.sourceforge.net>
 Phat R. <phatthanaphol@gmail.com>
     for reporting a minor bug
 
+Joe "Pragmatk" <pragmatk@gmail.com>
+    for reporting a few bugs
+
 shiftzwei <shiftzwei@gmail.com>
     for reporting a couple of bugs
 

lib/core/common.py

@@ -507,7 +507,7 @@ def readInput(message, default=None):
 
         data = default
     else:
-        data = raw_input(message.encode(sys.stdout.encoding))
+        data = raw_input(message.encode(sys.stdout.encoding or conf.dataEncoding))
 
         if not data:
             data = default

lib/core/option.py

@@ -511,8 +511,8 @@ def __setUnion():
         debugMsg = "setting the UNION query SQL injection range of columns"
         logger.debug(debugMsg)
 
-        if "-" not in conf.uCols:
-            raise sqlmapSyntaxException, "--union-cols must be a range with hyphon"
+        if "-" not in conf.uCols or len(conf.uCols.split("-")) != 2:
+            raise sqlmapSyntaxException, "--union-cols must be a range with hyphon (e.g. 1-10)"
 
         conf.uCols = conf.uCols.replace(" ", "")
         conf.uColsStart, conf.uColsStop = conf.uCols.split("-")

lib/core/replication.py

@@ -8,6 +8,7 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapMissingDependence
+from lib.core.exception import sqlmapValueException
 
 class Replication:
     """
@@ -62,7 +63,11 @@ class Replication:
             """
             This function is used for inserting row(s) into current table.
             """
+            if len(values) == len(self.columns):
                 self.parent.cursor.execute('INSERT INTO %s VALUES (%s)' % (self.name, ','.join(['?']*len(values))), values)
+            else:
+                errMsg = "wrong number of columns used in replicating insert"
+                raise sqlmapValueException, errMsg
 
         def select(self, condition=None):
             """