Merge branch 'master' into multicastvnc

Conflicts:
	libvncserver/sockets.c

Author: bk138

.travis.yml

@@ -1,4 +1,15 @@
 language: c
 
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+
+before_install:
+- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"; fi'
+
 # before build script, run autoreconf
 before_script: autoreconf -fiv

CMakeLists.txt

@@ -36,6 +36,7 @@ find_package(GnuTLS)
 find_package(Threads)
 find_package(X11)
 find_package(OpenSSL)
+find_package(PkgConfig)
 find_library(LIBGCRYPT_LIBRARIES gcrypt)
 
 # Check whether the version of libjpeg we found was libjpeg-turbo and print a
@@ -102,6 +103,17 @@ if(PNG_FOUND)
 endif(PNG_FOUND)
 option(LIBVNCSERVER_ALLOW24BPP "Allow 24 bpp" ON)
 
+pkg_check_modules(SYSTEMD "libsystemd")
+if(SYSTEMD_FOUND)
+  option(LIBVNCSERVER_WITH_SYSTEMD "Build with systemd socket activation support" ON)
+endif(SYSTEMD_FOUND)
+
+if(LIBVNCSERVER_WITH_SYSTEMD)
+  add_definitions(-DLIBVNCSERVER_WITH_SYSTEMD)
+  include_directories(${SYSTEMD_INCLUDE_DIRS})
+  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${SYSTEMD_LIBRARIES})
+endif(LIBVNCSERVER_WITH_SYSTEMD)
+
 if(GNUTLS_FOUND)
   set(LIBVNCSERVER_WITH_CLIENT_TLS 1)
   option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (gnutls)" ON)

README

@@ -118,7 +118,7 @@ drawn the cursor every time an update is sent. LibVNCServer handles
 all the details. Just set the cursor and don't bother any more.
 
 To set the mouse coordinates (or emulate mouse clicks), call
-  defaultPtrAddEvent(buttonMask,x,y,cl);
+  rfbDefaultPtrAddEvent(buttonMask,x,y,cl);
 IMPORTANT: do this at the end of your function, because this actually draws
 the cursor if no cursor encoding is active.
 
@@ -184,7 +184,7 @@ kbdReleaseAllKeys(rfbClientPtr cl)
 ptrAddEvent(int buttonMask,int x,int y,rfbClientPtr cl)
   is called when the mouse moves or a button is pressed.
   WARNING: if you want to have proper cursor handling, call
-	defaultPtrAddEvent(buttonMask,x,y,cl)
+	rfbDefaultPtrAddEvent(buttonMask,x,y,cl)
   in your own function. This sets the coordinates of the cursor.
 setXCutText(char* str,int len,rfbClientPtr cl)
   is called when the selection changes.
@@ -248,7 +248,7 @@ the original code from ORL/AT&T.
 
 When I began hacking with computers, my first interest was speed. So, when I
 got around assembler, I programmed the floppy to do much of the work, because
-it's clock rate was higher than that of my C64. This was my first experience
+its clock rate was higher than that of my C64. This was my first experience
 with client/server techniques.
 
 When I came around Xwindows (much later), I was at once intrigued by the
@@ -259,7 +259,7 @@ modem from home, it was no longer that much fun.
 When I started working with ASP (Application Service Provider) programs, I
 tumbled across Tarantella and Citrix. Being a security fanatic, the idea of
 running a server on windows didn't appeal to me, so Citrix went down the
-basket. However, Tarantella has it's own problems (security as well as the
+basket. However, Tarantella has its own problems (security as well as the
 high price). But at the same time somebody told me about this "great little
 administrator's tool" named VNC. Being used to windows programs' sizes, the
 surprise was reciprocal inverse to the size of VNC!
@@ -326,7 +326,7 @@ I am always amazed how people react whenever Microsoft(tm) puts in some
 features into their products which were around for a long time. Especially
 reporters seem to not know dick about what they are reporting about! But
 what is every time annoying again, is that they don't do it right. Every
-concept has it's new name (remember what enumerators used to be until
+concept has its new name (remember what enumerators used to be until
 Mickeysoft(tm) claimed that enumerators are what we thought were iterators.
 Yeah right, enumerators are also containers. They are not separated. Muddy.)
 
@@ -393,7 +393,7 @@ The people at AT&T worked really well to produce something as clean and lean
 as VNC. The managers decided that for their fame, they would release the
 program for free. But not only that! They realized that by releasing also
 the code for free, VNC would become an evolving little child, conquering
-new worlds, making it's parents very proud. As well they can be! To protect
+new worlds, making its parents very proud. As well they can be! To protect
 this innovation, they decided to make it GPL, not BSD. The principal
 difference is: You can make closed source programs deriving from BSD, not
 from GPL. You have to give proper credit with both.

common/zywrletemplate.c

@@ -352,7 +352,7 @@ static InlineX void Harr(signed char* pX0, signed char* pX1)
  In this method, H/L and X0/X1 is always same position.
  This lead us to more speed and less memory.
  Of cause, the result of both method is quite same
- because it's only difference that coefficient position.
+ because its only difference is that coefficient position.
 */
 static InlineX void WaveletLevel(int* data, int size, int l, int SkipPixel)
 {

configure.ac

@@ -68,6 +68,9 @@ if test ! -z "$with_ffmpeg"; then
 fi
 AM_CONDITIONAL(HAVE_MP3LAME, test "$HAVE_MP3LAME" = "true")
 
+PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd], [with_systemd=1], [with_systemd=0])
+AM_CONDITIONAL([WITH_SYSTEMD], [test $with_systemd -eq 1])
+
 # Seem to need this dummy here to induce the 'checking for egrep... grep -E', etc.
 # before it seemed to be inside the with_jpeg conditional. 
 AC_CHECK_HEADER(thenonexistentheader.h, HAVE_THENONEXISTENTHEADER_H="true")

examples/example.c

@@ -56,7 +56,7 @@ static void initBuffer(unsigned char* buffer)
   }
 }
 
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
 
 typedef struct ClientData {
   rfbBool oldButton;

examples/zippy.c

@@ -7,7 +7,7 @@
 static int maxx=400, maxy=400, bpp=4;
 /* odd maxx doesn't work (vncviewer bug) */
 
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
 
 /* turns the framebuffer black */
 void blank_framebuffer(char* frame_buffer, int x1, int y1, int x2, int y2);

libvncclient/rfbproto.c

@@ -151,13 +151,22 @@ void* rfbClientGetClientData(rfbClient* client, void* tag)
 
 /* messages */
 
+static rfbBool CheckRect(rfbClient* client, int x, int y, int w, int h) {
+  return x + w <= client->width && y + h <= client->height;
+}
+
 static void FillRectangle(rfbClient* client, int x, int y, int w, int h, uint32_t colour) {
   int i,j;
 
   if (client->frameBuffer == NULL) {
       return;
   }
 
+  if (!CheckRect(client, x, y, w, h)) {
+    rfbClientLog("Rect out of bounds: %dx%d at (%d, %d)\n", x, y, w, h);
+    return;
+  }
+
 #define FILL_RECT(BPP) \
     for(j=y*client->width;j<(y+h)*client->width;j+=client->width) \
       for(i=x;i<x+w;i++) \
@@ -179,6 +188,11 @@ static void CopyRectangle(rfbClient* client, uint8_t* buffer, int x, int y, int
       return;
   }
 
+  if (!CheckRect(client, x, y, w, h)) {
+    rfbClientLog("Rect out of bounds: %dx%d at (%d, %d)\n", x, y, w, h);
+    return;
+  }
+
 #define COPY_RECT(BPP) \
   { \
     int rs = w * BPP / 8, rs2 = client->width * BPP / 8; \
@@ -205,6 +219,16 @@ static void CopyRectangleFromRectangle(rfbClient* client, int src_x, int src_y,
       return;
   }
 
+  if (!CheckRect(client, src_x, src_y, w, h)) {
+    rfbClientLog("Source rect out of bounds: %dx%d at (%d, %d)\n", src_x, src_y, w, h);
+    return;
+  }
+
+  if (!CheckRect(client, dest_x, dest_y, w, h)) {
+    rfbClientLog("Dest rect out of bounds: %dx%d at (%d, %d)\n", dest_x, dest_y, w, h);
+    return;
+  }
+
 #define COPY_RECT_FROM_RECT(BPP) \
   { \
     uint##BPP##_t* _buffer=((uint##BPP##_t*)client->frameBuffer)+(src_y-dest_y)*client->width+src_x-dest_x; \

libvncclient/ultra.c

@@ -98,14 +98,14 @@ HandleUltraBPP (rfbClient* client, rfbBool multicast, int rx, int ry, int rw, in
 
   /* uncompress the data */
   uncompressedBytes = client->raw_buffer_size;
-  inflateResult = lzo1x_decompress(
+  inflateResult = lzo1x_decompress_safe(
               (lzo_byte *)client->ultra_buffer, toRead,
               (lzo_byte *)client->raw_buffer, (lzo_uintp) &uncompressedBytes,
               NULL);
 
-  
+  /* Note that uncompressedBytes will be 0 on output overrun */
   if ((rw * rh * (BPP / 8)) != uncompressedBytes)
-      rfbClientLog("Ultra decompressed too little (%d < %d)", (rw * rh * (BPP / 8)), uncompressedBytes);
+      rfbClientLog("Ultra decompressed unexpected amount of data (%d != %d)\n", (rw * rh * (BPP / 8)), uncompressedBytes);
 
   /* Put the uncompressed contents of the update on the screen. */
   if ( inflateResult == LZO_E_OK ) 
@@ -180,7 +180,7 @@ HandleUltraZipBPP (rfbClient* client, int rx, int ry, int rw, int rh)
 
   /* uncompress the data */
   uncompressedBytes = client->raw_buffer_size;
-  inflateResult = lzo1x_decompress(
+  inflateResult = lzo1x_decompress_safe(
               (lzo_byte *)client->ultra_buffer, toRead,
               (lzo_byte *)client->raw_buffer, &uncompressedBytes, NULL);
   if ( inflateResult != LZO_E_OK ) 

libvncserver/Makefile.am

@@ -62,6 +62,12 @@ LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \
 libvncserver_la_SOURCES=$(LIB_SRCS)
 libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS)
 
+if WITH_SYSTEMD
+AM_CPPFLAGS += -DLIBVNCSERVER_WITH_SYSTEMD
+libvncserver_la_CFLAGS = $(LIBSYSTEMD_CFLAGS)
+libvncserver_la_LIBADD += $(LIBSYSTEMD_LIBS)
+endif
+
 lib_LTLIBRARIES=libvncserver.la
 libvncserver_la_LDFLAGS = -version-info 1:0:0