[Spice-commits] 2 commits - configure.ac server/red_worker.c spice-common

[Alon Levy]

 configure.ac        |    3 +++
 server/red_worker.c |    6 ++++++
 spice-common        |    2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit bd10d502f8ed078102c2c16e12d6cbd17e724b13
Author: Alon Levy <alevy at redhat.com>
Date:   Mon Aug 27 16:02:24 2012 +0300

    support automake >= 1.12
    
    Requires a single line (sans comments) change to configure.ac in
    spice-common too, to define the new AM_PROG_AR.

diff --git a/configure.ac b/configure.ac
index 7bd4313..79eeb3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
+# For automake >= 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
 AM_MAINTAINER_MODE
 
diff --git a/spice-common b/spice-common
index c2f5849..2c55c9d 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit c2f58492ad2df22c4eb4e6c04750010113dce567
+Subproject commit 2c55c9d0c6a5752a16f5e22667196b461c85d4c8
commit e7aee13e571662f9af87ef90533aa77c754d7747
Author: Alon Levy <alevy at redhat.com>
Date:   Sun Jul 29 10:27:11 2012 +0200

    server/red_worker: handle_dev_update_area: fail if invalid area

diff --git a/server/red_worker.c b/server/red_worker.c
index 28fed60..2fa0e3a 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -4592,6 +4592,12 @@ static void red_update_area(RedWorker *worker, const SpiceRect *area, int surfac
 #endif
     spice_debug("surface %d: area ==>", surface_id);
     rect_debug(area);
+
+    spice_return_if_fail(surface_id >= 0 && surface_id < NUM_SURFACES);
+    spice_return_if_fail(area);
+    spice_return_if_fail(area->left >= 0 && area->top >= 0 &&
+                         area->left < area->right && area->top < area->bottom);
+
     surface = &worker->surfaces[surface_id];
 
     last = NULL;