Skip to content

Commit cae108d

Browse files
committed
careful at merging pull requests with TABs (sqlmapproject#466)
1 parent a53823f commit cae108d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

‎lib/takeover/xp_cmdshell.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ def _xpCmdshellTest(self):
114114
errMsg += "--tmp-path switch or you will not be able to retrieve "
115115
errMsg += "the commands output"
116116
logger.error(errMsg)
117-
elif isNoneValue(output):
118-
logger.error("unable to retrieve xp_cmdshell output")
117+
elif isNoneValue(output):
118+
logger.error("unable to retrieve xp_cmdshell output")
119119
else:
120120
logger.info("xp_cmdshell extended procedure is usable")
121121

@@ -208,12 +208,12 @@ def xpCmdshellEvalCmd(self, cmd, first=None, last=None):
208208
self.delRemoteFile(self.tmpFile)
209209

210210
query = "SELECT %s FROM %s ORDER BY id" % (self.tblField, self.cmdTblName)
211+
output = None
211212

212-
output = None
213213
if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct:
214214
output = inject.getValue(query, resumeValue=False, blind=False, time=False)
215215

216-
if (output is None) or len(output)==0 or output[0] is None:
216+
if (output is None) or len(output)==0 or output[0] is None:
217217
output = []
218218
count = inject.getValue("SELECT COUNT(id) FROM %s" % self.cmdTblName, resumeValue=False, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
219219

0 commit comments

Comments
 (0)