Check nextEnabledOutput()'s return in bestModeForAspect()

In case no enabled outputs, we will reference wrong index of
output array.
(cherry picked from commit 56c615368c)
This commit is contained in:
Zhenyu Wang 2008-10-08 13:33:55 +08:00 committed by Adam Jackson
parent 43e3af9cac
commit 4e6cbd3238

View File

@ -1903,7 +1903,8 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
int o = -1, p;
DisplayModePtr mode = NULL, test = NULL, match = NULL;
nextEnabledOutput(config, enabled, &o);
if (!nextEnabledOutput(config, enabled, &o))
return NULL;
while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
test = mode;
for (p = o; nextEnabledOutput(config, enabled, &p); ) {