summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 01:18:01 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 01:18:01 +0000
commit536628bb4bcb0a0d749e0c01412a5eb5d6d24063 (patch)
treea256b9531e429c176776aa50c723414b151b6c49 /hw/dmx
parent53e97ce4ddd993248561c245143b61915ea254b5 (diff)
Coverity #1037: Sanity check idx before use.
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/dmxextension.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index feadb5e31..24f796954 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -1062,8 +1062,8 @@ static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)
/** Reattach previously detached back-end screen. */
int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
{
- ScreenPtr pScreen = screenInfo.screens[idx];
- DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+ ScreenPtr pScreen;
+ DMXScreenInfo *dmxScreen;
CARD32 scrnNum = idx;
DMXScreenInfo oldDMXScreen;
int i;
@@ -1083,6 +1083,8 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
/* Cannot add a screen that does not exist */
if (idx < 0 || idx >= dmxNumScreens) return 1;
+ pScreen = screenInfo.screens[idx];
+ dmxScreen = &dmxScreens[idx];
/* Cannot attach to a screen that is already opened */
if (dmxScreen->beDisplay) {