diff options
author | Rouven Czerwinski <rouven@czerwinskis.de> | 2019-02-26 20:46:25 +0100 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-03-04 12:50:27 -0500 |
commit | a95c4abd66d0a0574fd10e315483470a3d21d51b (patch) | |
tree | 22b5f9334e0c52c689922f1b77bd7b3cbfdf7e0c | |
parent | cursor: remove unused node assignement (diff) | |
download | sway-a95c4abd66d0a0574fd10e315483470a3d21d51b.tar.gz sway-a95c4abd66d0a0574fd10e315483470a3d21d51b.tar.zst sway-a95c4abd66d0a0574fd10e315483470a3d21d51b.zip |
cursor: intitialize sx and sy to zero
If node_at_coords does an early return without setting these values, they can be
used uninitialized later. Initialize both to zero.
-rw-r--r-- | sway/input/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 210e6144..87811550 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -280,7 +280,7 @@ static void cursor_do_rebase(struct sway_cursor *cursor, uint32_t time_msec, | |||
280 | void cursor_rebase(struct sway_cursor *cursor) { | 280 | void cursor_rebase(struct sway_cursor *cursor) { |
281 | uint32_t time_msec = get_current_time_msec(); | 281 | uint32_t time_msec = get_current_time_msec(); |
282 | struct wlr_surface *surface = NULL; | 282 | struct wlr_surface *surface = NULL; |
283 | double sx, sy; | 283 | double sx = 0.0, sy = 0.0; |
284 | cursor->previous.node = node_at_coords(cursor->seat, | 284 | cursor->previous.node = node_at_coords(cursor->seat, |
285 | cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); | 285 | cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); |
286 | cursor_do_rebase(cursor, time_msec, cursor->previous.node, surface, sx, sy); | 286 | cursor_do_rebase(cursor, time_msec, cursor->previous.node, surface, sx, sy); |
@@ -476,7 +476,7 @@ static void cursor_motion_absolute(struct sway_cursor *cursor, | |||
476 | dx, dy, dx, dy); | 476 | dx, dy, dx, dy); |
477 | 477 | ||
478 | struct wlr_surface *surface = NULL; | 478 | struct wlr_surface *surface = NULL; |
479 | double sx, sy; | 479 | double sx = 0.0, sy = 0.0; |
480 | struct sway_node *node = node_at_coords(cursor->seat, | 480 | struct sway_node *node = node_at_coords(cursor->seat, |
481 | lx, ly, &surface, &sx, &sy); | 481 | lx, ly, &surface, &sx, &sy); |
482 | 482 | ||