Mercurial > mplayer.hg

changeset 33107:eda3df3e4a9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent an out-of-bounds array access. This out-of-bounds array access was of not much effect until r33190, because the variables falsely changed (set to 1) were either almost always unused (the last member of the mainItems array) or variable menuIsPresent which only has effect if there is a menu present (in which case it is set anyway). With r33190 the wItem (and thus the guiItems) structure size changed and now variables were accessed whose changings have visible effect. After releasing the moved main (or playbar) window, the IndexOfItems values got destroyed and items disappeared.
author ib
date Sun, 03 Apr 2011 14:24:36 +0000
parents e9e5ee3a1a82
children 5450a92ac4bd
files gui/mplayer/mw.c gui/mplayer/pb.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gui/mplayer/mw.c	Sun Apr 03 10:54:03 2011 +0000
+++ b/gui/mplayer/mw.c	Sun Apr 03 14:24:36 2011 +0000
@@ -437,8 +437,11 @@
           break;
    case wsRLMouseButton:
           boxMoved=0;
+          if ( SelectedItem != -1 )   // NOTE TO MYSELF: only if itButton, itHPotmeter or itVPotmeter
+           {
           item=&appMPlayer.mainItems[SelectedItem];
           item->pressed=btnReleased;
+           }
           SelectedItem=-1;
           if ( currentselected == - 1 ) { itemtype=0; break; }
           value=0;
--- a/gui/mplayer/pb.c	Sun Apr 03 10:54:03 2011 +0000
+++ b/gui/mplayer/pb.c	Sun Apr 03 14:24:36 2011 +0000
@@ -161,8 +161,11 @@
 
 	break;
    case wsRLMouseButton:
+        if ( SelectedItem != -1 )   // NOTE TO MYSELF: only if itButton, itHPotmeter or itVPotmeter
+         {
 	item=&appMPlayer.barItems[SelectedItem];
 	item->pressed=btnReleased;
+         }
 	SelectedItem=-1;
 	if ( currentselected == - 1 ) { itemtype=0; break; }
 	value=0;