Merge remote-tracking branch 'xenocara/master' into mpi/libdrm-update

3 files changed, 17 insertions, 10 deletions

diff --git a/3RDPARTY b/3RDPARTY
index 540530114..d43739fba 100644
--- a/3RDPARTY
+++ b/3RDPARTY
@@ -1,4 +1,4 @@
-# $OpenBSD: 3RDPARTY,v 1.139 2012/11/03 15:24:50 matthieu Exp $
+# $OpenBSD: 3RDPARTY,v 1.140 2012/11/16 17:46:18 matthieu Exp $
 #
 
 Package: 	Freetype
@@ -15,7 +15,7 @@ Archive Site:	http://invisible-island.net/xterm/xterm.html
 
 Package:	Mesa
 Version		7.11.2
-Current Vers:	8.0.5
+Current Vers:	8.0.5/9.0
 Maintainer:	Brian Paul
 Archive Site:	http://www.mesa3d.org/
 
diff --git a/MODULES b/MODULES
index a5aca6c23..ea86fd1fd 100644
--- a/MODULES
+++ b/MODULES
@@ -1,4 +1,4 @@
-# $OpenBSD: MODULES,v 1.235 2012/11/03 15:24:50 matthieu Exp $
+# $OpenBSD: MODULES,v 1.236 2012/11/16 17:46:18 matthieu Exp $
 #
 # X.Org maintained modules
 #
@@ -102,7 +102,7 @@ driver/xf86-input-vmmouse	12.9.0	7.7+
 driver/xf86-input-void		1.4.0	7.7
 driver/xf86-video-apm		1.2.5
 driver/xf86-video-ark		0.7.5	7.7+
-driver/xf86-video-ati		6.14.6	7.7+
+driver/xf86-video-ati		7.0.0	7.7+	needs-update-and-kms
 driver/xf86-video-chips		1.2.5
 driver/xf86-video-cirrus	1.5.1	7.7+
 driver/xf86-video-dummy		0.3.6	7.7+
@@ -110,13 +110,13 @@ driver/xf86-video-geode		2.11.13	7.7
 driver/xf86-video-glint		1.2.8	7.7+
 driver/xf86-video-i128		1.3.6	7.7+
 driver/xf86-video-i740		1.3.4
-driver/xf86-video-intel		2.20.8	7.7+	needs-update
+driver/xf86-video-intel		2.20.13	7.7+	needs-update-and-kms
 driver/xf86-video-mach64	6.9.3	7.7+
-driver/xf86-video-mga		1.6.1	7.7+
+driver/xf86-video-mga		1.6.2	7.7+	needs-update
 driver/xf86-video-neomagic	1.2.7	7.7+
 driver/xf86-video-nv		2.1.20	7.7+
-driver/xf86-video-openchrome	0.3.1	7.7+	needs-update
-driver/xf86-video-r128		6.8.4	7.7+
+driver/xf86-video-openchrome	0.3.1	7.7+	needs-update-and-dri
+driver/xf86-video-r128		6.9.1	7.7+	needs-update
 driver/xf86-video-rendition	4.2.5
 driver/xf86-video-s3		0.6.5
 driver/xf86-video-s3virge	1.10.6
@@ -208,7 +208,7 @@ lib/libxcb			1.9	7.7+	needs-update
 lib/libxkbfile			1.0.8	7.7
 lib/libxkbui			1.0.2
 lib/libxtrans			1.2.7	7.7
-lib/pixman			0.26.2
+lib/pixman			0.28.0		needs-update
 lib/xcb-util			0.3.9		needs-update
 lib/xcb-util-image		0.3.9		needs-import
 lib/xcb-util-keysyms		0.3.9		needs-import
diff --git a/app/cwm/xmalloc.c b/app/cwm/xmalloc.c
index b41da2e33..8e9d22ab2 100644
--- a/app/cwm/xmalloc.c
+++ b/app/cwm/xmalloc.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xmalloc.c,v 1.9 2012/11/09 03:52:02 okan Exp $
+ * $OpenBSD: xmalloc.c,v 1.10 2012/11/16 14:15:48 okan Exp $
  */
 
 #include <sys/param.h>
@@ -23,6 +23,7 @@
 
 #include <err.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,6 +36,8 @@ xmalloc(size_t siz)
 {
 	void	*p;
 
+	if (siz == 0)
+		errx(1, "xmalloc: zero size");
 	if ((p = malloc(siz)) == NULL)
 		err(1, "malloc");
 
@@ -46,6 +49,10 @@ xcalloc(size_t no, size_t siz)
 {
 	void	*p;
 
+	if (siz == 0 || no == 0)
+		errx(1, "xcalloc: zero size");
+	if (SIZE_MAX / no < siz)
+		errx(1, "xcalloc: no * siz > SIZE_MAX");
 	if ((p = calloc(no, siz)) == NULL)
 		err(1, "calloc");