Fix invalid memory access in rdpmouseControl() #124
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
metalefty
reviewed
Jul 20, 2018
xrdpmouse/rdpMouse.c
Outdated
| @@ -256,6 +256,7 @@ rdpmouseControl(DeviceIntPtr device, int what) | |||
| map[6] = 6; | |||
| map[7] = 7; | |||
| map[8] = 8; | |||
| map[9] = 9; | |||
There was a problem hiding this comment.
Good catch, thanks! What about using for loop like seen in xorg and vnc code?
|
Fair point. I've added a loop and used a macro for the number of buttons like everyone else seems to. If you're happy with that let me know and I'll squash the commits. |
|
Squash it! Then I'll merge. |
matt335672
force-pushed
the
rdp-mouse-invalid-mem-rw
branch
from
87b4c93
to
cad9094
Compare
|
Squashed. |
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Aug 10, 2018
Backport these fixes for invalid memory access: - neutrinolabs/xorgxrdp#124 - neutrinolabs/xorgxrdp#125 Approved by: hrs (mentor) Obtained from: upstream Relnotes: https://github.com/neutrinolabs/xorgxrdp/releases/tag/v0.2.7 Sponsored by: HAW International, Inc. Differential Revision: https://reviews.freebsd.org/D16601 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@476807 35697150-7ecd-e111-bb59-0022644237b5
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
Aug 10, 2018
Backport these fixes for invalid memory access: - neutrinolabs/xorgxrdp#124 - neutrinolabs/xorgxrdp#125 Approved by: hrs (mentor) Obtained from: upstream Relnotes: https://github.com/neutrinolabs/xorgxrdp/releases/tag/v0.2.7 Sponsored by: HAW International, Inc. Differential Revision: https://reviews.freebsd.org/D16601
Jehops
pushed a commit
to Jehops/freebsd-ports-legacy
that referenced
this pull request
Aug 10, 2018
Backport these fixes for invalid memory access: - neutrinolabs/xorgxrdp#124 - neutrinolabs/xorgxrdp#125 Approved by: hrs (mentor) Obtained from: upstream Relnotes: https://github.com/neutrinolabs/xorgxrdp/releases/tag/v0.2.7 Sponsored by: HAW International, Inc. Differential Revision: https://reviews.freebsd.org/D16601 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@476807 35697150-7ecd-e111-bb59-0022644237b5
swills
pushed a commit
to swills/freebsd-ports
that referenced
this pull request
Aug 12, 2018
Backport these fixes for invalid memory access: - neutrinolabs/xorgxrdp#124 - neutrinolabs/xorgxrdp#125 Approved by: hrs (mentor) Obtained from: upstream Relnotes: https://github.com/neutrinolabs/xorgxrdp/releases/tag/v0.2.7 Sponsored by: HAW International, Inc. Differential Revision: https://reviews.freebsd.org/D16601 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@476807 35697150-7ecd-e111-bb59-0022644237b5
svmhdvn
pushed a commit
to svmhdvn/freebsd-ports
that referenced
this pull request
Jan 10, 2024
Backport these fixes for invalid memory access: - neutrinolabs/xorgxrdp#124 - neutrinolabs/xorgxrdp#125 Approved by: hrs (mentor) Obtained from: upstream Relnotes: https://github.com/neutrinolabs/xorgxrdp/releases/tag/v0.2.7 Sponsored by: HAW International, Inc. Differential Revision: https://reviews.freebsd.org/D16601
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.
This is one of a couple of pull requests to address the memory issues found in #104 by @keithrob91.
This is the simpler of the two and corresponds to the last paragraph of the issue raised.
The second argument of the call to InitPointerDeviceStruct() is an array based at 1, rather than 0. This can be seen in other projects. See for example vncPointerProc() from TigerVNC's unix/xserver/hw/vnc/Input.c. The Xorg code on the other end is in xserver/dix/devices.c