UI_process() didn't generate errors #2037
Closed
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
Since there are many parts of UI_process() that can go wrong, it isn't very helpful to only return -1 with no further explanation. With this change, the error message will at least show which part went wrong.
3 tasks
richsalz
approved these changes
Dec 7, 2016
|
|
||
| if (ui->meth->ui_open_session && !ui->meth->ui_open_session(ui)) | ||
| return -1; | ||
| if (ui->meth->ui_open_session && !ui->meth->ui_open_session(ui)) { |
There was a problem hiding this comment.
need explicit "!= NULL" test.
There was a problem hiding this comment.
Only there? This is old stuff and that kind of change is needed all over the place. I'd say that's for a separate cleanup PR.
|
|
||
| if (ok == -1) { | ||
| UIerr(UI_F_UI_PROCESS, UI_R_PROCESSING_ERROR); | ||
| ERR_add_error_data(2, "while ", state); |
| @@ -427,9 +427,13 @@ static int print_error(const char *str, size_t len, UI *ui) | |||
| int UI_process(UI *ui) | |||
| { | |||
| int i, ok = 0; | |||
| const char *state = NULL; | |||
There was a problem hiding this comment.
this should probably be something generic like "processing" to future-proof from future bunglers.
levitte
added a commit
that referenced
this pull request
Dec 7, 2016
Since there are many parts of UI_process() that can go wrong, it isn't very helpful to only return -1 with no further explanation. With this change, the error message will at least show which part went wrong. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2037)
levitte
added a commit
that referenced
this pull request
Dec 7, 2016
Since there are many parts of UI_process() that can go wrong, it isn't very helpful to only return -1 with no further explanation. With this change, the error message will at least show which part went wrong. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2037) (cherry picked from commit 0a687ab)
|
Merged to master and 1.1.0 |
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.
Checklist
Description of change
Since there are many parts of UI_process() that can go wrong, it isn't
very helpful to only return -1 with no further explanation. With this
change, the error message will at least show which part went wrong.