summaryrefslogtreecommitdiffstats
path: root/input/input.h
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2011-10-24 02:28:56 +0200
committerwm4 <wm4@mplayer2.org>2012-01-18 02:52:34 +0100
commit98203198b6aacbeb99f1e10a9f41acaa9ead0126 (patch)
tree525178fab52936aba1ebc463f6812dc60d02bab9 /input/input.h
parent03ba61c3bf01367ff6c1c134ebe70f2e7ecbcae2 (diff)
downloadmpv-98203198b6aacbeb99f1e10a9f41acaa9ead0126.tar.bz2
mpv-98203198b6aacbeb99f1e10a9f41acaa9ead0126.tar.xz
input: fix crashes with libmenu
Note: now that libmenu has been removed, the related code in input.c has been removed. If libmenu is ever added back, a queue_remove() function that can remove any item in the input queue will be required. libmenu triggered some special case that caused crashes by double frees. In particular the queue_pop function is used, expecting to remove an element that is not necessarily always the one that queue_pop removes. Fix by adding a queue_remove functions. Rewrite the other queue functions, since these are probably buggy as well. queue_pop didn't even attempt to maintain the doubly linked list.
Diffstat (limited to 'input/input.h')
-rw-r--r--input/input.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/input/input.h b/input/input.h
index 4058ce3d99..8d32a9907c 100644
--- a/input/input.h
+++ b/input/input.h
@@ -194,7 +194,6 @@ typedef struct mp_cmd {
int nargs;
struct mp_cmd_arg args[MP_CMD_MAX_ARGS];
int pausing;
- struct mp_cmd *queue_prev;
struct mp_cmd *queue_next;
} mp_cmd_t;