misc

aafemt · aafemt · commit 2f89d89b56d8 · 2016-08-12T10:48:29.000+02:00
diff --git a/src/common/os/win32/mod_loader.cpp b/src/common/os/win32/mod_loader.cpp
@@ -187,13 +187,13 @@ bool ModuleLoader::isLoadableModule(const PathName& module)
 
 void ModuleLoader::doctorModuleExtension(PathName& name)
 {
-	if (name.length() > 4)
+	const char* dllExt = ".dll";
+	const size_t dllExtLen = strlen(dllExt);
+	if (name.length() <= dllExtLen ||
+		PathName(name, name.length() - dllExtLen, dllExtLen) != dllExt)
 	{
-		PathName ext(name, name.length() - 4, 4);
-		if (ext == ".dll")
-			return;
+		name.appendString(".dll");
 	}
-	name.appendString(".dll");
 }
 
 ModuleLoader::Module* ModuleLoader::loadModule(const PathName& modPath)

Original file line number	Diff line number	Diff line change
`@@ -187,13 +187,13 @@ bool ModuleLoader::isLoadableModule(const PathName& module)`
`187`	`187`
`188`	`188`	`void ModuleLoader::doctorModuleExtension(PathName& name)`
`189`	`189`	`{`
`190`		`- if (name.length() > 4)`
	`190`	`+ const char* dllExt = ".dll";`
	`191`	`+ const size_t dllExtLen = strlen(dllExt);`
	`192`	`+ if (name.length() <= dllExtLen \|\|`
	`193`	`+ PathName(name, name.length() - dllExtLen, dllExtLen) != dllExt)`
`191`	`194`	`{`
`192`		`- PathName ext(name, name.length() - 4, 4);`
`193`		`- if (ext == ".dll")`
`194`		`- return;`
	`195`	`+ name.appendString(".dll");`
`195`	`196`	`}`
`196`		`- name.appendString(".dll");`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`ModuleLoader::Module* ModuleLoader::loadModule(const PathName& modPath)`