UPBGE: Fix for issue #797 #869
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
lordloki
commented
Oct 5, 2018
| @@ -1297,7 +1297,13 @@ static void gpu_node_input_link(GPUNode *node, GPUNodeLink *link, const GPUType | |||
| input->type = type; | |||
| input->source = GPU_SOURCE_VEC_UNIFORM; | |||
|
|
|||
| memcpy(input->vec, link->ptr1, type * sizeof(float)); | |||
| if (type == GPU_INT) { | |||
There was a problem hiding this comment.
@panzergame We can even make this GPU_INT check only and left all above changes as they are in current master
There was a problem hiding this comment.
What about using an array for size of types indexed by GPUType ? So you can change the values and avoid exceptions in the code when adding conditions.
There was a problem hiding this comment.
I'm not convinced to do that before final release. I would prefer fix memcpy and make the tiny refactor after
There was a problem hiding this comment.
As you want, but the refactor is just defining an array of 18 elements.
lordloki
force-pushed
the
ge_bug_fix_797_alternative
branch
from
eb06a57 to
637bee8
Compare
panzergame
reviewed
Oct 7, 2018
| @@ -55,6 +55,11 @@ | |||
| #include <string.h> | |||
| #include <stdarg.h> | |||
|
|
|||
| #ifndef ARRAYSIZE | |||
There was a problem hiding this comment.
Is it possible to include BLI_utildefines.h for this macro ?
panzergame
approved these changes
Oct 9, 2018
Introduce a new array of GPUType sizes to avoid a buffer overrun. The new array will allow make the system extensible easier. More comments added. P.D. It fixes the win32 crash
lordloki
force-pushed
the
ge_bug_fix_797_alternative
branch
from
e46fe8f to
d438f1c
Compare
youle31
pushed a commit
that referenced
this pull request
May 26, 2019
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.
Set GPU_INT to 5 avoid buffer overrun
This is due to the following:
in gpu_codegen.c in gpu_node_input_link we have the following catch all
and in the typedef for GPUInput we have this for vec
As the type for INT was 17, this will copy 17 floats from link->ptr1 overwriting input->link with garbage.