From 1822cc05f68c2d1b3135bbf52a60056894f24b84 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 22 Apr 2018 01:12:56 +0200
Subject: [PATCH] Patch for #3060

---
 lib/core/settings.py | 2 +-
 lib/request/basic.py | 2 +-
 txt/checksum.md5     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 13a6c742e..08ee02c09 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.4.18"
+VERSION = "1.2.4.19"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/lib/request/basic.py b/lib/request/basic.py
index 6e82b2da1..1fe7fd8d3 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -334,7 +334,7 @@ def decodePage(page, contentEncoding, contentType):
 
             kb.pageEncoding = kb.pageEncoding or checkCharEncoding(getHeuristicCharEncoding(page))
 
-            if kb.pageEncoding and kb.pageEncoding.lower() == "utf-8-sig":
+            if (kb.pageEncoding or "").lower() == "utf-8-sig":
                 kb.pageEncoding = "utf-8"
                 if page and page.startswith("\xef\xbb\xbf"):  # Reference: https://docs.python.org/2/library/codecs.html (Note: noticed problems when "utf-8-sig" is left to Python for handling)
                     page = page[3:]
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 2bfe4a58a..a3ffdc22a 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -46,7 +46,7 @@ c9a56e58984420a5abb7a3f7aadc196d  lib/core/optiondict.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-13d487ed576734ef3178720ec98ec406  lib/core/settings.py
+50e82ed2cd620854ce6e74cf18781117  lib/core/settings.py
 0dfc2ed40adf72e302291f6ecd4406f6  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 a35efa7bec9f1e6cedf17c9830a79241  lib/core/target.py
@@ -66,7 +66,7 @@ aaad2a0d80f05eaebe52c71519b3dfc7  lib/parse/headers.py
 ec4e56bbb1349176b2a22e0b99ba6a55  lib/parse/payloads.py
 492654567e72b6a14584651fcd9f16e6  lib/parse/sitemap.py
 30eed3a92a04ed2c29770e1b10d39dc0  lib/request/basicauthhandler.py
-7e8e0a3fdebbe443832c1bab2f8d3869  lib/request/basic.py
+596988f14408cde1a2d3b5c9f231873a  lib/request/basic.py
 c0cabedead14b8a23353b606672cff42  lib/request/comparison.py
 e2b40b94446d59fb25abe68c429bae74  lib/request/connect.py
 dd4598675027fae99f2e2475b05986da  lib/request/direct.py