Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes having sys/resource.h and not having the getrlimit function #633

Open
wants to merge 424 commits into
base: master
Choose a base branch
from

Conversation

kdschlosser
Copy link

This fixes a compilation error that can occur if the sys/resource.h file does exist but the getrlimit function doesn't.

bk138 added 30 commits April 19, 2010 17:27
Manually resolved conflicts:
	x11vnc/util.c
…tipointer mode.

Right now this is used in pointer.c and uinput.c, other files still
have to be reworked, especially userinput.c with the XRECORD and
wireframe stuff...
…arg.

This is for instance the case when the core pointer is meant.
Fixes lots of potential segfaults.
This redirects ambigious Xlib calls to the virtual core pointer.
Now every pixel-format and encoding combination has
continuous sequence numbering. Before messages were
counted unaware of pixel-format and encoding combination,
leaving clients with the impression of huge holes in the
sequence.
Conflicts, resolved:

	rfb/rfb.h
32 byte are needed to store 255 values simultaneously.
The regions of partial updates are the same with every pixel-format
and encoding combination, so save them only once. Before, several
partial updates with the same sequence number were stored, rendering
the NACK mechanism broke.
This now resends NACKes partial updates to clients instead
of just marking the NACKed regions as modified in the next
multicast framebuffer update. This way the client side counting
of lost messages is way more near to reality.
Christian Beier and others added 26 commits June 9, 2016 22:00
Conflicts:
	libvncserver/sockets.c
Using 'aNULL' enables anonymous Elliptic Curve cipher suits.
It improves compatibility with some TLS libraries, e.g. GnuTLS.

Ref: https://www.openssl.org/docs/man1.1.1/man1/ciphers.html
int y = rect.y1;
int w = rect.x2 - x;
int h = rect.y2 - y;
size_t maxSizeRect = w * h * 4;

Check failure

Code scanning / CodeQL

Multiplication result converted to larger type High

Multiplication result may overflow 'int' before it is converted to 'size_t'.
@kdschlosser
Copy link
Author

I am not sure why the commit history looks like that. all I did was fork the repo, clone my local copy. prior to making a new branch I pulled any changes from your master branch and pushed them to my fork. then I created the new branch and made the code changes and committed them and pushed them to the new branch on my fork. then opened the PR and this is what resulted.

Never seen this happen before as that is the way I have always handled making a PR.

I think you can merge this and squash it so it doesn't muddy the commit history. IDK. this has never happened to me before.

@bk138
Copy link
Member

bk138 commented Oct 31, 2024

@kdschlosser looks a bit like you cloned the multicastvnc branch and now this PR wants to merge it back. Please try force-pushing or maybe a new PR, both welcome. Can't merge in the current form.

@kdschlosser
Copy link
Author

I will mess about with it and see what is going on. I am not sure why it ended up like this. I might have to clone the repo over again and make all of the changes again that I have made.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants