From 2aefe0bee1fc1bb74f1e02448825917183c305e5 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon, 5 Apr 2021 18:33:37 +0200
Subject: [PATCH] - Fix crash when not specifying the collection for MongoDB  
 modified:   storage/connect/cmgoconn.cpp

- Fix(?) Linux compile errors
  modified:   storage/connect/tabrest.cpp
---
 storage/connect/cmgoconn.cpp | 6 ++++++
 storage/connect/tabrest.cpp  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/storage/connect/cmgoconn.cpp b/storage/connect/cmgoconn.cpp
index edee1874b97..474f940a8cf 100644
--- a/storage/connect/cmgoconn.cpp
+++ b/storage/connect/cmgoconn.cpp
@@ -150,6 +150,12 @@ void CMgoConn::mongo_init(bool init)
 /***********************************************************************/
 bool CMgoConn::Connect(PGLOBAL g)
 {
+	if (!Pcg->Db_name || !Pcg->Coll_name) {
+		// This would crash in mongoc_client_get_collection
+		strcpy(g->Message, "Missing DB or collection name");
+		return true;
+	}	// endif name
+
 	if (!IsInit)
 #if defined(__WIN__)
 		__try {
diff --git a/storage/connect/tabrest.cpp b/storage/connect/tabrest.cpp
index 3ac86388ab2..9204043da62 100644
--- a/storage/connect/tabrest.cpp
+++ b/storage/connect/tabrest.cpp
@@ -24,6 +24,7 @@
 #else		 // !__WIN__
 #define __stdcall
 #include <dlfcn.h>         // dlopen(), dlclose(), dlsym() ...
+#include <libexplain/execlp.h>
 #endif   // !__WIN__
 #endif	 // !REST_SOURCE
 #define _OS_H_INCLUDED     // Prevent os.h to be called
@@ -148,7 +149,6 @@ int Xcurl(PGLOBAL g, PCSZ Http, PCSZ Uri, PCSZ filename)
 	}	// endif CreateProcess
 #else   // !__WIN__
 	char  fn[600];
-	int   rcd;
 	pid_t pID = vfork();
 
 	sprintf(fn, "-o%s", filename);