From 04699d8d1b2f1421d5d657e058f056f16d256971 Mon Sep 17 00:00:00 2001
From: zit-hb <hb@zecure.org>
Date: Sun, 6 Mar 2016 10:44:12 +0100
Subject: [PATCH] Remove null bytes for libdbi.

---
 include/database.h |  5 +++++
 src/database.cpp   | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/include/database.h b/include/database.h
index 79b8024..9924203 100644
--- a/include/database.h
+++ b/include/database.h
@@ -248,6 +248,11 @@ namespace swd {
              * @brief The mutex for database access.
              */
             boost::mutex dbi_mutex_;
+
+            /**
+             * @brief Remove nullbytes for libdbi.
+             */
+            std::string remove_null(std::string target);
     };
 
     /**
diff --git a/src/database.cpp b/src/database.cpp
index c835e98..8f81808 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -311,13 +311,13 @@ int swd::database::save_request(const int& profile_id, const std::string& caller
 
     boost::unique_lock<boost::mutex> scoped_lock(dbi_mutex_);
 
-    char *caller_esc = strdup(caller.c_str());
+    char *caller_esc = strdup(remove_null(caller).c_str());
     dbi_conn_quote_string(conn_, &caller_esc);
 
-    char *resource_esc = strdup(resource.c_str());
+    char *resource_esc = strdup(remove_null(resource).c_str());
     dbi_conn_quote_string(conn_, &resource_esc);
 
-    char *client_ip_esc = strdup(client_ip.c_str());
+    char *client_ip_esc = strdup(remove_null(client_ip).c_str());
     dbi_conn_quote_string(conn_, &client_ip_esc);
 
     dbi_result res = dbi_conn_queryf(conn_, "INSERT INTO requests (profile_id, "
@@ -347,10 +347,10 @@ int swd::database::save_parameter(const int& request_id, const std::string& path
 
     boost::unique_lock<boost::mutex> scoped_lock(dbi_mutex_);
 
-    char *path_esc = strdup(path.c_str());
+    char *path_esc = strdup(remove_null(path).c_str());
     dbi_conn_quote_string(conn_, &path_esc);
 
-    char *value_esc = strdup(value.c_str());
+    char *value_esc = strdup(remove_null(value).c_str());
     dbi_conn_quote_string(conn_, &value_esc);
 
     dbi_result res = dbi_conn_queryf(conn_, "INSERT INTO parameters "
@@ -379,10 +379,10 @@ int swd::database::save_hash(const int& request_id, const std::string& algorithm
 
     boost::unique_lock<boost::mutex> scoped_lock(dbi_mutex_);
 
-    char *algorithm_esc = strdup(algorithm.c_str());
+    char *algorithm_esc = strdup(remove_null(algorithm).c_str());
     dbi_conn_quote_string(conn_, &algorithm_esc);
 
-    char *digest_esc = strdup(digest.c_str());
+    char *digest_esc = strdup(remove_null(digest).c_str());
     dbi_conn_quote_string(conn_, &digest_esc);
 
     dbi_result res = dbi_conn_queryf(conn_, "INSERT INTO hashes (request_id, "
@@ -490,3 +490,8 @@ void swd::database::set_cache_outdated(const int& profile_id,
         throw swd::exceptions::database_exception("Can't execute cache_outdated query");
     }
 }
+
+std::string swd::database::remove_null(std::string target) {
+    std::replace(target.begin(), target.end(), '\0', ' ');
+    return target;
+}