Skip to content

Commit 66983d3

Browse files
committed
Minor update
1 parent 49902fe commit 66983d3

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

data/txt/sha256sums.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ cd63cfc6b00c5e47462cd4a35b3a79306d6712f9d607d5c784f9e946f92a8a7f lib/controller
166166
34e9cf166e21ce991b61ca7695c43c892e8425f7e1228daec8cadd38f786acc6 lib/controller/controller.py
167167
49bcd74281297c79a6ae5d4b0d1479ddace4476fddaf4383ca682a6977b553e3 lib/controller/handler.py
168168
4608f21a4333c162ab3c266c903fda4793cc5834de30d06affe9b7566dd09811 lib/controller/__init__.py
169-
ac44a343947162532dbf17bd1f9ab424f8008f677367c5ad3f9f7b715a679818 lib/core/agent.py
169+
774cd68596d6c1b15fe16bfb3901487b15ca7d284bbe8b347b3a316b0e24cc78 lib/core/agent.py
170170
86a9cb82c7e7beb4730264dae20bf3b7cd87c0dcaee587367362cf319f7bb079 lib/core/bigarray.py
171171
f6062e324fdeaacf9df0a289fc3f12f755143e3876a70cb65b38aa2e690f73c1 lib/core/common.py
172172
11c748cc96ea2bc507bc6c1930a17fe4bc6fdd2dd2a80430df971cb21428eb00 lib/core/compat.py
@@ -190,7 +190,7 @@ c4bfb493a03caf84dd362aec7c248097841de804b7413d0e1ecb8a90c8550bc0 lib/core/readl
190190
d1bd70c1a55858495c727fbec91e30af267459c8f64d50fabf9e4ee2c007e920 lib/core/replication.py
191191
1d0f80b0193ac5204527bfab4bde1a7aee0f693fd008e86b4b29f606d1ef94f3 lib/core/revision.py
192192
d2eb8e4b05ac93551272b3d4abfaf5b9f2d3ac92499a7704c16ed0b4f200db38 lib/core/session.py
193-
08856dded2c0ec98a3d3bec0c3be1e02863a9f2eea05bdd68d14217a9e9a58d1 lib/core/settings.py
193+
38a9c666b8f2e3586d6b34f2fd4d690153aa6df5ca10d0a8c23a6e998a67078e lib/core/settings.py
194194
1c5eab9494eb969bc9ce118a2ea6954690c6851cbe54c18373c723b99734bf09 lib/core/shell.py
195195
4eea6dcf023e41e3c64b210cb5c2efc7ca893b727f5e49d9c924f076bb224053 lib/core/subprocessng.py
196196
cdd352e1331c6b535e780f6edea79465cb55af53aa2114dcea0e8bf382e56d1a lib/core/target.py

lib/core/agent.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@ def payload(self, place=None, parameter=None, value=None, newValue=None, where=N
119119
if place == PLACE.URI:
120120
origValue = origValue.split(kb.customInjectionMark)[0]
121121
else:
122-
origValue = filterNone(re.search(_, origValue.split(BOUNDED_INJECTION_MARKER)[0]) for _ in (r"\w+\Z", r"[^\"'><]+\Z", r"[^ ]+\Z"))[0].group(0)
122+
try:
123+
origValue = filterNone(re.search(_, origValue.split(BOUNDED_INJECTION_MARKER)[0]) for _ in (r"\w+\Z", r"[^\"'><]+\Z", r"[^ ]+\Z"))[0].group(0)
124+
except IndexError:
125+
pass
123126
origValue = origValue[origValue.rfind('/') + 1:]
124127
for char in ('?', '=', ':', ',', '&'):
125128
if char in origValue:
@@ -883,14 +886,16 @@ def forgeUnionQuery(self, query, position, count, comment, prefix, suffix, char,
883886
query = query[len("TOP %s " % topNum):]
884887
unionQuery += "TOP %s " % topNum
885888

886-
intoRegExp = re.search(r"(\s+INTO (DUMP|OUT)FILE\s+'(.+?)')", query, re.I)
889+
intoFileRegExp = re.search(r"(\s+INTO (DUMP|OUT)FILE\s+'(.+?)')", query, re.I)
887890

888-
if intoRegExp:
889-
intoRegExp = intoRegExp.group(1)
890-
query = query[:query.index(intoRegExp)]
891+
if intoFileRegExp:
892+
infoFile = intoFileRegExp.group(1)
893+
query = query[:query.index(infoFile)]
891894

892895
position = 0
893896
char = NULL
897+
else:
898+
infoFile = None
894899

895900
for element in xrange(0, count):
896901
if element > 0:
@@ -909,8 +914,8 @@ def forgeUnionQuery(self, query, position, count, comment, prefix, suffix, char,
909914
if fromTable and not unionQuery.endswith(fromTable):
910915
unionQuery += fromTable
911916

912-
if intoRegExp:
913-
unionQuery += intoRegExp
917+
if infoFile:
918+
unionQuery += infoFile
914919

915920
if multipleUnions:
916921
unionQuery += " UNION ALL SELECT "

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from thirdparty import six
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.9.12.55"
22+
VERSION = "1.9.12.56"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

0 commit comments

Comments
 (0)