Fix regression from r1.107 (lost a return); kettenis@ pointed out the high

potential for a use-after-free (true!) where kn@ ran into the regression using
an app that actually exercised the XGrabPointer() failure path.
This commit is contained in:
okan 2019-08-12 00:52:36 +00:00
parent 3a6045e486
commit ba4d949d04

View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: menu.c,v 1.107 2019/03/04 19:28:18 okan Exp $
* $OpenBSD: menu.c,v 1.108 2019/08/12 00:52:36 okan Exp $
*/
#include <sys/types.h>
@ -129,6 +129,7 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
CurrentTime) != GrabSuccess) {
XftDrawDestroy(mc.xftdraw);
XDestroyWindow(X_Dpy, mc.win);
return(NULL);
}
XGetInputFocus(X_Dpy, &focuswin, &focusrevert);