head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.12
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.10
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.8
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.6
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.4
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.2
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.3.0.10
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.8
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.6
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.4
	pkgsrc-2008Q1:1.3.0.2
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.2.0.4
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.2
	pkgsrc-2007Q3-base:1.2;
locks; strict;
comment	@# @;


1.4
date	2008.11.17.11.30.31;	author wiz;	state dead;
branches;
next	1.3;

1.3
date	2008.01.29.03.45.36;	author bjs;	state Exp;
branches;
next	1.2;

1.2
date	2007.09.21.20.47.14;	author joerg;	state dead;
branches;
next	1.1;

1.1
date	2007.09.21.19.39.11;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 1.1.4:

(pkgsrc already contained the Coverity and GetDeviceControl patches)

Alan Coopersmith (1):
      Coverity #743/744: Returned without freeing storage bufp/savp

Matthieu Herrb (1):
      nuke RCS Ids

Peter Hutterer (2):
      GetDeviceControl: calculate the length field correctly.
      libXi 1.1.4
@
text
@$NetBSD: patch-aa,v 1.3 2008/01/29 03:45:36 bjs Exp $

Coverity #743/744: Returned without freeing storage bufp/savp
 
If either bufp or savp failed to malloc, we returned without freeing 
the other.  (from GIT)

--- src/XGMotion.c.orig	2007-09-05 12:41:58.000000000 -0400
+++ src/XGMotion.c
@@@@ -115,6 +115,8 @@@@ Time stop;
     savp = readp = (int *)Xmalloc(size);
     bufp = (int *)Xmalloc(size2);
     if (!bufp || !savp) {
+	Xfree(bufp);
+	Xfree(savp);
 	*nEvents = 0;
 	_XEatData(dpy, (unsigned long)size);
 	UnlockDisplay(dpy);
@


1.3
log
@

Add two bug fixes from GIT (see patch headings for more info).
Bump rev.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Remove patch, XInputCheckExtension has some magic for that.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2007/09/21 19:39:11 joerg Exp $
d3 1
a3 4
--- src/XStFocus.c.orig	2007-09-21 21:35:50.000000000 +0200
+++ src/XStFocus.c
@@@@ -72,8 +72,10 @@@@ XSetDeviceFocus(dpy, dev, focus, revert_
     XExtDisplayInfo *info = XInput_find_display(dpy);
d5 14
a18 9
     LockDisplay(dpy);
-    if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
+    if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) {
+        UnlockDisplay(dpy);
 	return (NoSuchExtension);
+    }
 
     GetReq(SetDeviceFocus, req);
     req->reqType = info->codes->major_opcode;
@


1.1
log
@Fix locking bug in upstream code. Ride on the initial update.
@
text
@d1 1
a1 1
$NetBSD$
@