diff options
| author | Elijah Newren <newren gmail com> | 2006-01-15 04:45:34 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2006-01-15 04:45:34 +0000 |
| commit | 50bcc976bccaf9c170345d3c94df53ca85119aa6 (patch) | |
| tree | 14cbea547c08eff42abe926b07cf80680354b8d6 | |
| parent | def12b85b8d24ae9635c53512daceb5a446d12db (diff) | |
| download | metacity-50bcc976bccaf9c170345d3c94df53ca85119aa6.tar.gz | |
Don't dereference a NULL string. Fixes #327013.
2006-01-14 Elijah Newren <newren gmail com>
* src/window.c (__window_is_terminal): Don't dereference a NULL
string. Fixes #327013.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2006-01-14 Elijah Newren <newren gmail com> + * src/window.c (__window_is_terminal): Don't dereference a NULL + string. Fixes #327013. + +2006-01-14 Elijah Newren <newren gmail com> + * src/compositor.[ch]: fix compilation when HAVE_COMPOSITE_EXTENSIONS is undefined. #326912 diff --git a/src/window.c b/src/window.c index 18789140..0dca7502 100644 --- a/src/window.c +++ b/src/window.c @@ -1717,7 +1717,7 @@ intervening_user_event_occurred (MetaWindow *window) gboolean __window_is_terminal (MetaWindow *window) { - if (window == NULL) + if (window == NULL || window->res_name == NULL) return FALSE; /* gnome-terminal -- if you couldn't guess */ |