Fix decoding the hints dictionary. #158
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
Back port of 8dad8a7 g_variant_lookup works like g_variant_get, so using a format string of "v" only works if the type is actually a GVariant. Since none of the hints have GVariant values, that means every g_variant_get with a "v" format will fail. Fix all of the g_variant_lookup calls so that they either unpack a value directly, or use a "@" prefix when it's more convenient to fetch the value as a GVariant pointer. In addition, in cases where we do fetch a GVariant, make sure that we unreference it afterward.
kbrenneman
reviewed
Sep 17, 2019
| } | ||
| /* deal with x, and y hints */ | ||
| else if (g_variant_lookup(hints, "x", "v", &data)) | ||
| else if (g_variant_lookup(hints, "x", "i", &x)) | ||
| { | ||
| x = g_variant_get_int32 (data); |
There was a problem hiding this comment.
This g_variant_get_int32 call needs to be removed. The g_variant_lookup call before already assigns the value to x. data is going to be either uninitialized or freed at this point.
kbrenneman
reviewed
Sep 17, 2019
| { | ||
| x = g_variant_get_int32 (data); | ||
|
|
||
| if (g_variant_lookup(hints, "y", "v", &data)) | ||
| if (g_variant_lookup(hints, "y", "i", &y)) | ||
| { | ||
| y = g_variant_get_int32 (data); |
There was a problem hiding this comment.
Same as above -- the g_variant_lookup call assigns to y, so remove the g_variant_get_int32 call.
|
Two g_variant_get_int32 calls that were removed in the original patch got left in this one. If it makes things easier, I've also got a local branch with this fix on top of 1.22 -- I actually started there because it was easier to diagnose and test on my system. I can submit a PR with that if anyone wants. |
|
Yes, that would be helpful, thanks!
|
|
Okay, I just posted #159. |
|
Thanks, i will close this one. |
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.
Back port of
8dad8a7
@flexiondotorg @vkareh @kbrenneman
Please take a look at it. Commit from master didn't clean apply with a cherry-pick.