diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-05 16:17:56 +1000 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2012-08-01 17:50:45 -0700 |
| commit | 31ca2e2d5d2f26826fe15d4537a57e1cbf863140 (patch) | |
| tree | c6777dc1c386d72c87dedb054a5123d847183634 | |
| parent | 7197c1c571dab1ecef2dc57b8e3bd2689b589f6d (diff) | |
list.h: don't crash when removing an element from a NULL list
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 167993254a5cbe11a1f44fad1e8ae042089c1619)
| -rw-r--r-- | include/list.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/list.h b/include/list.h index 96c0bcbd6..d54a207b1 100644 --- a/include/list.h +++ b/include/list.h @@ -453,7 +453,7 @@ xorg_list_is_empty(struct xorg_list *head) #define nt_list_del(_entry, _list, _type, _member) \ do { \ _type *__e = _entry; \ - if (__e == NULL) break; \ + if (__e == NULL || _list == NULL) break; \ if ((_list) == __e) { \ _list = __e->_member; \ } else { \ |