Skip to content
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

Jump to bottom

Updated SetSearchKey function to handle null search #974

Merged
merged 4 commits into from
Sep 22, 2023
Merged

Updated SetSearchKey function to handle null search #974

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5cf0f3
add null check to SetSearchKeySingle in nn_olv_PostTypes.h
Squall-Leonhart Sep 21, 2023
6e5503c
null > nullptr and logger entry
Squall-Leonhart Sep 21, 2023
2ad531b
Updated SetSearchKey function to handle null search keys.
Squall-Leonhart Sep 21, 2023
3a91784
Merge branch 'REMIXFIX' of https://github.com/Squall-Leonhart/Cemu in…
Squall-Leonhart Sep 22, 2023
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
10 changes: 10 additions & 0 deletions src/Cafe/OS/libs/nn_olv/nn_olv_PostTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,11 @@ namespace nn
// SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCwUc
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)
return OLV_RESULT_INVALID_PARAMETER;
memset(&_this->searchKeyArray[searchKeyIndex], 0, sizeof(SearchKey));
Expand All @@ -546,6 +551,11 @@ namespace nn
// SetSearchKey__Q3_2nn3olv25DownloadPostDataListParamFPCw
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);
}

Expand Down