Path validation fixes #214
Conversation
| // ModLoader's hooks require relative paths in LoadLibrary to work | ||
| FilepathRemoveParent(buff, CLEO_GetGameDirectory()); | ||
|
|
||
| ptr = LoadLibrary(buff.c_str()); |
There was a problem hiding this comment.
why not
OPCODE_READ_PARAM_FILEPATH(path);
HMODULE ptr = LoadLibrary(path);
if (ptr != nullptr)
{
m_libraries.insert(ptr);
}
OPCODE_WRITE_PARAM_PTR(ptr);
OPCODE_CONDITION_RESULT(ptr != nullptr);
return OR_CONTINUE;
There was a problem hiding this comment.
What about LoadLibrary("kernel32.dll") ?
There was a problem hiding this comment.
I assume the path shouldn't change and remain "kernel32.dll"?
There was a problem hiding this comment.
If you change work dir with 0A99 it will be added at the beginning then. That function did not used path reading macro on purpose.
There was a problem hiding this comment.
Wdym? If workdir is within game directory it will stripped from the path.
There was a problem hiding this comment.
ML seems unable to install its hooks if library passed to LoadLibrary is not relative path. It happens when loading cleo plugins too.
I think CLEO_ResolvePath will still resolve some paths as absolute. Like virtual "cleo:"
There was a problem hiding this comment.
ML has nothing to do with virtual/absolute paths. What script was reported not working to make this change?
There was a problem hiding this comment.
ML has nothing to do with virtual/absolute paths. What script was reported not working to make this change?
https://github.com/cleolibrary/CLEO5/blob/master/source/CScriptEngine.cpp#L682
Perhaps if changed it will become dead loop in some cases, as resolved path will still be seen as not resolved.
There was a problem hiding this comment.
If we want to make virtual path ML-compatible (i.g. relative to game dir), then we should do it in ResolvePath. stream_custom_script "cleo:\1.cs" and load_library "cleo:\1.dll" should work the same.
MiranDMC
force-pushed
the
ModLoader_fixes
branch
from
9106f1a
to
c8e12a7
Compare
No description provided.