Add a null-check for stored plan text in pg_store_plans_internal(). #35
Conversation
This file contains hidden or 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
Variable pstr retrieved from function ptext_fetch() can be NULL due to various factors. Previously, pstr was passed as-is to each per-format process and used in strlen(), causing a crash when it was NULL.
rjuju
requested changes
Feb 2, 2025
| @@ -1579,6 +1579,12 @@ pg_store_plans_internal(FunctionCallInfo fcinfo, | |||
| else | |||
| pstr = SHMEM_PLAN_PTR(entry); | |||
|
|
|||
| if (pstr == NULL) | |||
| { | |||
| values[i++] = CStringGetTextDatum("<invalid plan>"); | |||
There was a problem hiding this comment.
I think it would be better to set the value as null rather than adding another hardcoded value that users will have to explicitly check.
Also, since the code is not that complicated it would be better to avoid a gotoand just nest the instructions.
| @@ -1612,10 +1618,13 @@ pg_store_plans_internal(FunctionCallInfo fcinfo, | |||
| pfree(mstr); | |||
|
|
|||
| /* pstr is a pointer onto pbuffer */ | |||
|
|
|||
There was a problem hiding this comment.
please avoid some unrelated changes like that.
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.
Variable pstr retrieved from function ptext_fetch() can be NULL due to various factors. Previously, pstr was passed as-is to each per-format process and used in strlen(), causing a crash when it was NULL.
This is a fix for #34 issue.
#34