From 269f9e0daf7a54e0f2116c0e2173e763a3575556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 25 Nov 2016 09:21:27 +0100
Subject: Do not fail to build if litesql is not there

---
 src/main.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 019dff0..488032d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,9 @@
 
 #include <atomic>
 #include <signal.h>
-#include <litesql.hpp>
+#ifdef USE_DATABASE
+# include <litesql.hpp>
+#endif
 
 // A flag set by the SIGINT signal handler.
 static std::atomic<bool> stop(false);
@@ -83,11 +85,14 @@ int main(int ac, char** av)
   if (hostname.empty())
     return config_help("hostname");
 
+
+#ifdef USE_DATABASE
   try {
-      open_database();
-    } catch (const litesql::DatabaseError&) {
-      return 1;
-    }
+    open_database();
+  } catch (const litesql::DatabaseError&) {
+    return 1;
+  }
+#endif
 
   // Block the signals we want to manage. They will be unblocked only during
   // the epoll_pwait or ppoll calls. This avoids some race conditions,
-- 
cgit v1.2.3


From 25d46924bc2edd079d4d996d1d76d702d724341e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 2 May 2017 14:46:03 +0200
Subject: Fix a segmentation fault when connecting to a server without a port

fix #3260
---
 src/irc/irc_client.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index b0d3a47..de6b089 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -182,6 +182,11 @@ void IrcClient::start()
 {
   if (this->is_connecting() || this->is_connected())
     return;
+  if (this->ports_to_try.empty())
+    {
+      this->bridge.send_xmpp_message(this->hostname, "", "Can not connect to IRC server: no port specified.");
+      return;
+    }
   std::string port;
   bool tls;
   std::tie(port, tls) = this->ports_to_try.top();
-- 
cgit v1.2.3