From e33a48d40f1e2a8ce06bfd2905333dd32f4148a7 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 7 Apr 2011 12:54:30 +0000 Subject: [PATCH] minor refactoring --- lib/techniques/inband/union/use.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/inband/union/use.py index ea63403d4..4de88f599 100644 --- a/lib/techniques/inband/union/use.py +++ b/lib/techniques/inband/union/use.py @@ -74,10 +74,11 @@ def __oneShotUnionUse(expression, unpack=True): def configUnion(char=None, columns=None): def __configUnionChar(char): - if char.isdigit() or char == "NULL" or char.startswith("[RANDNUM"): - conf.uChar = char - elif not char.startswith("'") or not char.endswith("'"): - conf.uChar = "'%s'" % char + if isinstance(char, basestring): + if any([char.isdigit(), char == "NULL", char == "[RANDNUM]"]): + conf.uChar = char + else: + conf.uChar = "'%s'" % char.strip("'") def __configUnionCols(columns): columns = columns.replace(" ", "")