asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #26657 from marxin/fix-25641-ubsan-negative-value

Browse source 
Fix #25641 by not shifting a negative value.
This commit is contained in:
Rémi Verschelde 2019-03-05 23:02:59 +01:00 committed by GitHub
commit 85eb381a04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/visual/visual_server_viewport.h
View file

@ -90,7 +90,8 @@ public:
} }
CanvasKey(const RID &p_canvas, int p_layer, int p_sublayer) { CanvasKey(const RID &p_canvas, int p_layer, int p_sublayer) {
canvas = p_canvas; canvas = p_canvas;
stacking = ((int64_t)p_layer << 32) + p_sublayer; int64_t sign = p_layer < 0 ? -1 : 1;
stacking = sign * (((int64_t)ABS(p_layer)) << 32) + p_sublayer;
} }
int get_layer() const { return stacking >> 32; } int get_layer() const { return stacking >> 32; }
}; };