ES: Replace useless asserts with proper checks #4956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BhaaLseN
reviewed
Feb 24, 2017
Source/Core/Core/IOS/ES/ES.cpp
Outdated
| @@ -494,8 +498,8 @@ IPCCommandResult ES::ESGetDeviceID(const IOCtlVRequest& request) | |||
|
|
|||
| IPCCommandResult ES::GetTitleContentsCount(const IOCtlVRequest& request) | |||
| { | |||
| _dbg_assert_(IOS_ES, request.in_vectors.size() == 1); | |||
| _dbg_assert_(IOS_ES, request.io_vectors.size() == 1); | |||
| if (!request.HasNumberOfValidVectors(1, 0)) | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
leoetlino
force-pushed
the
es-checks
branch
3 times, most recently
from
8d9648d
to
7af150b
Compare
It makes absolutely no sense to have asserts for what is obviously an error condition. And they should definitely not cause Dolphin to crash because it assumes that everything is valid, and Dolphin should not report those to the user either, as it is very obviously a bug in the emulated software and there is nothing the user (or we) can do. This commit replaces all of the request asserts with proper checks and adds missing checks for some ioctlvs. We still do not check sizes yet; this will be done later.
lioncash
approved these changes
Mar 1, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It makes absolutely no sense to have asserts for what is obviously an error condition. And they should definitely not cause Dolphin to crash because it assumes that everything is valid, and Dolphin should not report those to the user either, as it is very obviously a bug in the emulated software and there is nothing the user (or we) can do.
This commit replaces all of the request asserts with proper checks and adds missing checks for some ioctlvs. We still do not check sizes yet; this will be done later to keep this easy to review.