diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /randr/rrmode.c | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'randr/rrmode.c')
| -rw-r--r-- | randr/rrmode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/randr/rrmode.c b/randr/rrmode.c index 63a67dad0..d5072084a 100644 --- a/randr/rrmode.c +++ b/randr/rrmode.c @@ -166,6 +166,8 @@ RRModesForScreen (ScreenPtr pScreen, int *num_ret) int num_screen_modes = 0; screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr)); + if (!screen_modes) + return NULL; /* * Add modes from all outputs |