Skip to content

Fix wrong dereferencing when resolving IServer #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RaphaelIT7 wants to merge 1 commit into
base: x86-64-support-sourcesdk
Choose a base branch
from
Open

Fix wrong dereferencing when resolving IServer #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion helpers_extended/source/InterfacePointers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,47 @@ namespace InterfacePointers
return iface_pointer;
}

template<class T>
static inline T *ResolveSymbolNoDereference(
SourceSDK::FactoryLoader &loader, const Symbol &symbol
)
{
if( symbol.type == Symbol::Type::None )
return nullptr;

#if defined SYSTEM_WINDOWS

auto iface = reinterpret_cast<T *>( symbol_finder.Resolve(
loader.GetModule( ), symbol.name.c_str( ), symbol.length
) );
return iface != nullptr ? iface : nullptr;

#elif defined SYSTEM_POSIX

return reinterpret_cast<T *>( symbol_finder.Resolve(
loader.GetModule( ), symbol.name.c_str( ), symbol.length
) );

#endif

}

template<class T>
static inline T *ResolveSymbolsNoDereference(
SourceSDK::FactoryLoader &loader, const std::vector<Symbol> &symbols
)
{
T *iface_pointer = nullptr;
for( const auto &symbol : symbols )
{
iface_pointer = ResolveSymbolNoDereference<T>( loader, symbol );
if( iface_pointer != nullptr )
break;
}

return iface_pointer;
}

namespace Internal
{
namespace Client
Expand Down Expand Up @@ -249,7 +290,7 @@ namespace InterfacePointers
if( iface_pointer == nullptr )
{
SourceSDK::FactoryLoader engine_loader( "engine" );
iface_pointer = ResolveSymbols<IServer>( engine_loader, Symbols::IServer );
iface_pointer = ResolveSymbolsNoDereference<IServer>( engine_loader, Symbols::IServer );
}

return iface_pointer;
Expand Down