Mirrors
/
Cemu
mirror of https://github.com/cemu-project/Cemu.git
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nn_olv: Handle nullptr key in SetSearchKey (#974)

This commit is contained in:
Squall Leonhart 2023-09-23 03:20:22 +10:00 committed by GitHub
parent b4aa10bee4
commit 638c4014a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Cafe/OS/libs/nn_olv/nn_olv_PostTypes.h
View File

@ -531,6 +531,11 @@ namespace nn
// SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCwUc // SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCwUc
static nnResult SetSearchKey(DownloadPostDataListParam* _this, const uint16be* searchKey, uint8 searchKeyIndex) static nnResult SetSearchKey(DownloadPostDataListParam* _this, const uint16be* searchKey, uint8 searchKeyIndex)
{ {
if( !searchKey )
{
memset(&_this->searchKeyArray[searchKeyIndex], 0, sizeof(SearchKey));
return OLV_RESULT_SUCCESS;
}
if (searchKeyIndex >= MAX_NUM_SEARCH_KEY) if (searchKeyIndex >= MAX_NUM_SEARCH_KEY)
return OLV_RESULT_INVALID_PARAMETER; return OLV_RESULT_INVALID_PARAMETER;
memset(&_this->searchKeyArray[searchKeyIndex], 0, sizeof(SearchKey)); memset(&_this->searchKeyArray[searchKeyIndex], 0, sizeof(SearchKey));
@ -546,6 +551,11 @@ namespace nn
// SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCw // SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCw
static nnResult SetSearchKeySingle(DownloadPostDataListParam* _this, const uint16be* searchKey) static nnResult SetSearchKeySingle(DownloadPostDataListParam* _this, const uint16be* searchKey)
{ {
if (searchKey == nullptr)
{
cemuLog_logDebug(LogType::NN_OLV, "DownloadPostDataListParam::SetSearchKeySingle: searchKeySingle is Null\n");
return OLV_RESULT_INVALID_PARAMETER;
}
return SetSearchKey(_this, searchKey, 0); return SetSearchKey(_this, searchKey, 0);
} }