2 files changed, 9 insertions, 6 deletions
diff --git a/external/easylogging++/ea_config.h b/external/easylogging++/ea_config.h
index 2524d3477..c97858f30 100644
--- a/external/easylogging++/ea_config.h
+++ b/external/easylogging++/ea_config.h
@@ -2,9 +2,11 @@
 
 #define ELPP_THREAD_SAFE
 #define ELPP_DEFAULT_LOG_FILE ""
-#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__
-#else
-#define ELPP_FEATURE_CRASH_LOG 1
-#endif
 #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING
 #define ELPP_NO_CHECK_MACROS
+#define ELPP_WINSOCK2
+#define ELPP_NO_DEBUG_MACROS
+
+#ifdef EASYLOGGING_CC
+#define ELPP_FEATURE_CRASH_LOG
+#endif
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc
index 31b201897..57742b2e5 100644
--- a/external/easylogging++/easylogging++.cc
+++ b/external/easylogging++/easylogging++.cc
@@ -1016,8 +1016,9 @@ const std::string OS::getBashOutput(const char* command) {
   char hBuff[4096];
   if (fgets(hBuff, sizeof(hBuff), proc) != nullptr) {
     pclose(proc);
-    if (hBuff[strlen(hBuff) - 1] == '\n') {
-      hBuff[strlen(hBuff) - 1] = '\0';
+    const size_t len = strlen(hBuff);
+    if (len > 0 && hBuff[len - 1] == '\n') {
+      hBuff[len- 1] = '\0';
     }
     return std::string(hBuff);
   }