frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xephyr-Xv: fix a crash when host X support several ports 

* hw/kdrive/ephyr/ephyrvideo.c:
	  (ephyrXVPrivQueryHostAdaptors): properly set
	  port private luke. This fixes a crash when
	  the host Xv supports multiple ports.
	  Make sure number of ports cannot be zero.
This commit is contained in:
Dodji Seketeli 2007-08-16 17:07:36 +02:00 committed by Dodji Seketeli
parent a38ad562a6
commit 47e6dff89e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/kdrive/ephyr/ephyrvideo.c
View File

@ -404,7 +404,8 @@ ephyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)
EphyrHostAttribute *attributes=NULL ; EphyrHostAttribute *attributes=NULL ;
EphyrHostImageFormat *image_formats=NULL ; EphyrHostImageFormat *image_formats=NULL ;
int num_video_formats=0, base_port_id=0, int num_video_formats=0, base_port_id=0,
num_attributes=0, num_formats=0, i=0; num_attributes=0, num_formats=0, i=0,
port_priv_offset=0;
unsigned num_encodings=0 ; unsigned num_encodings=0 ;
Bool is_ok = FALSE ; Bool is_ok = FALSE ;
@ -441,6 +442,12 @@ ephyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)
ephyrHostXVAdaptorArrayAt (a_this->host_adaptors, i) ; ephyrHostXVAdaptorArrayAt (a_this->host_adaptors, i) ;
if (!cur_host_adaptor) if (!cur_host_adaptor)
continue ; continue ;
a_this->adaptors[i].nPorts =
ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ;
if (a_this->adaptors[i].nPorts <=0) {
EPHYR_LOG_ERROR ("Could not find any port of adaptor %d\n", i) ;
continue ;
}
a_this->adaptors[i].type = a_this->adaptors[i].type =
ephyrHostXVAdaptorGetType (cur_host_adaptor) ; ephyrHostXVAdaptorGetType (cur_host_adaptor) ;
a_this->adaptors[i].type |= XvWindowMask ; a_this->adaptors[i].type |= XvWindowMask ;
@ -475,16 +482,18 @@ ephyrXVPrivQueryHostAdaptors (EphyrXVPriv *a_this)
&num_video_formats); &num_video_formats);
a_this->adaptors[i].pFormats = (KdVideoFormatPtr) video_formats ; a_this->adaptors[i].pFormats = (KdVideoFormatPtr) video_formats ;
a_this->adaptors[i].nFormats = num_video_formats ; a_this->adaptors[i].nFormats = num_video_formats ;
/* got a_this->adaptors[i].nPorts already
a_this->adaptors[i].nPorts = a_this->adaptors[i].nPorts =
ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ; ephyrHostXVAdaptorGetNbPorts (cur_host_adaptor) ;
*/
a_this->adaptors[i].pPortPrivates = a_this->adaptors[i].pPortPrivates =
xcalloc (a_this->adaptors[i].nPorts, xcalloc (a_this->adaptors[i].nPorts,
sizeof (DevUnion) + sizeof (EphyrPortPriv)) ; sizeof (DevUnion) + sizeof (EphyrPortPriv)) ;
port_priv_offset = a_this->adaptors[i].nPorts;
for (j=0; j < a_this->adaptors[i].nPorts; j++) { for (j=0; j < a_this->adaptors[i].nPorts; j++) {
int port_priv_offset = a_this->adaptors[i].nPorts ; EphyrPortPriv *port_privs_base =
EphyrPortPriv *port_priv = (EphyrPortPriv*)&a_this->adaptors[i].pPortPrivates[port_priv_offset];
(EphyrPortPriv*) EphyrPortPriv *port_priv = &port_privs_base[j] ;
&a_this->adaptors[i].pPortPrivates[port_priv_offset + j];
port_priv->port_number = base_port_id + j; port_priv->port_number = base_port_id + j;
port_priv->current_adaptor = &a_this->adaptors[i] ; port_priv->current_adaptor = &a_this->adaptors[i] ;
port_priv->xv_priv = a_this ; port_priv->xv_priv = a_this ;