d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't refer to mouse_info.u.datea.[xyz] while processing MOUSE_BUTTON_EVENT

Browse Source 
ioctl.  These fields don't have valid values for this ioctl.
PR: kern/6928
Submitted by: Bill Fenner <fenner@parc.xerox.com>
This commit is contained in:
Kazutaka YOKOTA 1998-06-24 10:21:30 +00:00
parent e29bc9add4
commit bf41934ccb
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/syscons/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.262 1998/06/07 17:11:02 dfr Exp $
* $Id: syscons.c,v 1.263 1998/06/13 18:53:22 steve Exp $
*/
#include "sc.h"
@ -1307,10 +1307,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cur_console->mouse_buttons &= ~mouse->u.event.id;
mouse_status.button &= ~mouse->u.event.id;
}
mouse_status.flags |=
((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ?
MOUSE_POSCHANGED : 0)
| (mouse_status.obutton ^ mouse_status.button);
mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
if (cur_console->status & MOUSE_ENABLED)
cur_console->status |= MOUSE_VISIBLE;

7
sys/i386/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.262 1998/06/07 17:11:02 dfr Exp $
* $Id: syscons.c,v 1.263 1998/06/13 18:53:22 steve Exp $
*/
#include "sc.h"
@ -1307,10 +1307,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cur_console->mouse_buttons &= ~mouse->u.event.id;
mouse_status.button &= ~mouse->u.event.id;
}
mouse_status.flags |=
((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ?
MOUSE_POSCHANGED : 0)
| (mouse_status.obutton ^ mouse_status.button);
mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
if (cur_console->status & MOUSE_ENABLED)
cur_console->status |= MOUSE_VISIBLE;

7
sys/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.262 1998/06/07 17:11:02 dfr Exp $
* $Id: syscons.c,v 1.263 1998/06/13 18:53:22 steve Exp $
*/
#include "sc.h"
@ -1307,10 +1307,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cur_console->mouse_buttons &= ~mouse->u.event.id;
mouse_status.button &= ~mouse->u.event.id;
}
mouse_status.flags |=
((mouse->u.data.x || mouse->u.data.y || mouse->u.data.z) ?
MOUSE_POSCHANGED : 0)
| (mouse_status.obutton ^ mouse_status.button);
mouse_status.flags |= mouse_status.obutton ^ mouse_status.button;
if (cur_console->status & MOUSE_ENABLED)
cur_console->status |= MOUSE_VISIBLE;