X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=af7ebede4da12966766731f04cae25e2135c3478;hb=93c24a5631ba5281046d2cd1b141cc2f0ce1d29f;hp=afe3f3b8b97e06061aaf4cd7e7cc0f2592c76ad9;hpb=ff787a954fe4b7b2d50d0dddd1437eda75df0421;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index afe3f3b8..af7ebede 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -1064,7 +1064,7 @@ void CALLBACK clearDynarec(void) {
 
 int LoadPlugins() {
 	int ret;
-	char Plugin[MAXPATHLEN];
+	char Plugin[MAXPATHLEN * 2];
 
 	ReleasePlugins();
 	SysLibError();
@@ -1141,11 +1141,11 @@ void ReleasePlugins() {
 
 	if (Config.UseNet && hNETDriver != NULL) NET_shutdown(); 
 
-	if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
-	if (hGPUDriver != NULL) SysCloseLibrary(hGPUDriver); hGPUDriver = NULL;
-	if (hSPUDriver != NULL) SysCloseLibrary(hSPUDriver); hSPUDriver = NULL;
-	if (hPAD1Driver != NULL) SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL;
-	if (hPAD2Driver != NULL) SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL;
+	if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; }
+	if (hGPUDriver != NULL) { SysCloseLibrary(hGPUDriver); hGPUDriver = NULL; }
+	if (hSPUDriver != NULL) { SysCloseLibrary(hSPUDriver); hSPUDriver = NULL; }
+	if (hPAD1Driver != NULL) { SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL; }
+	if (hPAD2Driver != NULL) { SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL; }
 
 	if (Config.UseNet && hNETDriver != NULL) {
 		SysCloseLibrary(hNETDriver); hNETDriver = NULL;
@@ -1164,12 +1164,12 @@ void ReleasePlugins() {
 int ReloadCdromPlugin()
 {
 	if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
-	if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
+	if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; }
 
 	if (UsingIso()) {
 		LoadCDRplugin(NULL);
 	} else {
-		char Plugin[MAXPATHLEN];
+		char Plugin[MAXPATHLEN * 2];
 		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Cdr);
 		if (LoadCDRplugin(Plugin) == -1) return -1;
 	}
@@ -1182,7 +1182,7 @@ void SetIsoFile(const char *filename) {
 		IsoFile[0] = '\0';
 		return;
 	}
-	strncpy(IsoFile, filename, MAXPATHLEN);
+	strncpy(IsoFile, filename, MAXPATHLEN - 1);
 }
 
 const char *GetIsoFile(void) {