mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Fix crash when not specifying the collection for MongoDB
modified: storage/connect/cmgoconn.cpp - Fix(?) Linux compile errors modified: storage/connect/tabrest.cpp
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user