database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Fix crash when not specifying the collection for MongoDB

Browse Source 
modified:   storage/connect/cmgoconn.cpp

- Fix(?) Linux compile errors
  modified:   storage/connect/tabrest.cpp
This commit is contained in:
Olivier Bertrand
2021-04-05 18:33:37 +02:00
parent caff19ada5
commit 2aefe0bee1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/cmgoconn.cpp
View File

@@ -150,6 +150,12 @@ void CMgoConn::mongo_init(bool init)
/***********************************************************************/ /***********************************************************************/
bool CMgoConn::Connect(PGLOBAL g) 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 (!IsInit)
#if defined(__WIN__) #if defined(__WIN__)
__try { __try {

2
storage/connect/tabrest.cpp
View File

@@ -24,6 +24,7 @@
#else // !__WIN__ #else // !__WIN__
#define __stdcall #define __stdcall
#include <dlfcn.h> // dlopen(), dlclose(), dlsym() ... #include <dlfcn.h> // dlopen(), dlclose(), dlsym() ...
#include <libexplain/execlp.h>
#endif // !__WIN__ #endif // !__WIN__
#endif // !REST_SOURCE #endif // !REST_SOURCE
#define _OS_H_INCLUDED // Prevent os.h to be called #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 } // endif CreateProcess
#else // !__WIN__ #else // !__WIN__
char fn[600]; char fn[600];
int rcd;
pid_t pID = vfork(); pid_t pID = vfork();
sprintf(fn, "-o%s", filename); sprintf(fn, "-o%s", filename);