diff --git a/lib/core/agent.py b/lib/core/agent.py
index a087313d4..485a77760 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -27,6 +27,7 @@ from lib.core.enums import PLACE
from lib.core.exception import sqlmapNoneDataException
from lib.core.settings import CUSTOM_INJECTION_MARK_CHAR
from lib.core.settings import FROM_DUMMY_TABLE
+from lib.core.settings import GENERIC_SQL_COMMENT
from lib.core.settings import PAYLOAD_DELIMITER
from lib.core.unescaper import unescaper
@@ -188,6 +189,9 @@ class Agent:
expression = self.cleanupPayload(expression)
+ if Backend.getIdentifiedDbms() == DBMS.ACCESS and comment == GENERIC_SQL_COMMENT:
+ comment = "%00"
+
if comment is not None:
expression += comment
diff --git a/lib/core/settings.py b/lib/core/settings.py
index f6601e16e..f73c0ac25 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -484,3 +484,6 @@ MAX_CONNECTION_CHUNK_SIZE = 10 * 1024 * 1024
# Mark used for trimming unnecessary content in large chunks
LARGE_CHUNK_TRIM_MARKER = "__TRIMMED_CONTENT__"
+
+# Generic SQL comment formation
+GENERIC_SQL_COMMENT = "-- "
diff --git a/xml/payloads.xml b/xml/payloads.xml
index f259cfa04..1e640bbc7 100644
--- a/xml/payloads.xml
+++ b/xml/payloads.xml
@@ -3537,348 +3537,6 @@ Formats:
-
-
- Generic UNION query (NUL comment) ([CHAR]) - [COLSTART] to [COLSTOP] columns (custom)
- 3
- 2
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- [COLSTART]-[COLSTOP]
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - [COLSTART] to [COLSTOP] columns (custom)
- 3
- 2
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- [COLSTART]-[COLSTOP]
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - [COLSTART] to [COLSTOP] columns (custom)
- 3
- 4
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- [COLSTART]-[COLSTOP]
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([CHAR]) - 1 to 10 columns
- 3
- 2
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- 1-10
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - 1 to 10 columns
- 3
- 2
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- 1-10
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - 1 to 10 columns
- 3
- 4
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- 1-10
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([CHAR]) - 11 to 20 columns
- 3
- 3
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- 11-20
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - 11 to 20 columns
- 3
- 3
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- 11-20
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - 11 to 20 columns
- 3
- 4
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- 11-20
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([CHAR]) - 21 to 30 columns
- 3
- 4
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- 21-30
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - 21 to 30 columns
- 3
- 4
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- 21-30
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - 21 to 30 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- 21-30
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([CHAR]) - 31 to 40 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- 31-40
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - 31 to 40 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- 31-40
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - 31 to 40 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- 31-40
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([CHAR]) - 41 to 50 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [CHAR]
- 41-50
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) (NULL) - 41 to 50 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- NULL
- 41-50
-
-
-
-
-
-
-
- Generic UNION query (NUL comment) ([RANDNUM]) - 41 to 50 columns
- 3
- 5
- 1
- 1,2,3,4,5
- 1
- [UNION]
-
-
- %00
- [RANDNUM]
- 41-50
-
-
-
-
-