2
3
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-15 10:54:18 +00:00

Compare commits

..

8 Commits

Author SHA1 Message Date
430c7eccd4 Hack to change submodule URL to reference HTTP internal name
Workaround for LetsEncrypt cert fiasco and local OpenSSL
2021-10-03 15:26:44 -06:00
3489b924ce Merge branch 'ticket/23'
closes #23
2021-10-03 15:21:52 -06:00
60e74f0042 Revert "Hack to work around LetsEncrypt DST Root CA X3 expiration until Openssl updated."
This reverts commit 09e43b28b5.
2021-10-03 15:20:34 -06:00
09e43b28b5 Hack to work around LetsEncrypt DST Root CA X3 expiration until Openssl updated. 2021-10-02 11:56:32 -06:00
46bc8cca4d Correctly allocate the NetVaultNode in pyVaultPlayerInfoListNode.
The affected code was ported from H'uru where NetVaultNode has a zeroing
constructor. OU does not have a zeroing constructor for this class, and
instead assumes that all allocations will be done with NEWZERO (there is
a debug mode assertion to this effect). The result of the improper
allocation is that the node fields flag could be garbage, causing a
vault node with random contents to be written to the server.

Unfortunately, NetVaultNode::Read_LCS is not extremely resilient to
reading in unexpected data, so this may result in a crash.
2021-10-02 00:55:10 -04:00
34a5d24f79 Merge branch 'ticket/18'
Closes #18
2021-09-09 16:43:36 -06:00
e2aec8d52c Fix an infinite loop in plDxPipeline.
H'Uru PR #719 commit log:

commit 5f53b86494605c484c0b304e0a5ab15a07929106
Author: Adam Johnson <AdamJohnso@gmail.com>
Date:   Fri Sep 4 07:38:15 2020 -0400

    Fix an infinite loop in plDXPipeline.

    This was observed in a 2x2 DXT1 mipmap produced by Korman. While Korman
    should probably force such a thing to be uncompressed, the pipeline
    should also not be able to enter such an obviously invalid state.

M       Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp
2021-09-07 14:45:45 -06:00
7b4d9e8e3f Merge branch 'ticket/17'
closes #17
2021-08-12 14:43:51 -06:00
3 changed files with 3 additions and 4 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "SDK-binary-VS2010"]
path = Build/VS2010/SDK-binary
url = https://foundry.openuru.org/gitblit/r/CWE-SDKs/SDK-binary-VS2010
url = http://urufoundry/gitblit/r/CWE-SDKs/SDK-binary-VS2010

View File

@ -107,7 +107,7 @@ void pyVaultPlayerInfoListNode::AddPlayer( UInt32 playerID )
if (HasPlayer(playerID) || !fNode)
return;
NetVaultNode* templateNode = new NetVaultNode();
NetVaultNode* templateNode = NEWZERO(NetVaultNode);
templateNode->IncRef();
templateNode->SetNodeType(plVault::kNodeType_PlayerInfo);
VaultPlayerInfoNode access(templateNode);

View File

@ -8663,10 +8663,9 @@ hsBool plDXPipeline::IProcessMipmapLevels( plMipmap *mipmap, UInt32 &numLevels,
if( mipmap->IsCompressed() || !( fSettings.fD3DCaps & kCapsDoesSmallTextures ) )
{
mipmap->SetCurrLevel( maxLevel );
while( ( mipmap->GetCurrWidth() | mipmap->GetCurrHeight() ) & sizeMask )
while( maxLevel > 0 && (( mipmap->GetCurrWidth() | mipmap->GetCurrHeight() ) & sizeMask) )
{
maxLevel--;
hsAssert( maxLevel >= 0, "How was this ever compressed?" );
mipmap->SetCurrLevel( maxLevel );
}
}