[PATCH] Fix bug #7035: unnecessary memmove in XOpenDisplay.

[Jamey Sharp]

There's been no response to this patch and I believe it's correct for
all platforms that worked before, so I've just pushed it.

--Jamey

On Thu, Jun 08, 2006 at 08:19:45PM -0700, Jamey Sharp wrote:
> Using memmove on the connection setup data causes a problem for XCB, but making
> Xlib stop doing that should be harmless for non-XCB as well.
> 
> ---
> 
> I'd like review before I commit this patch. Does the memmove somehow
> make XOpenDisplay 64-bit clean or something? (Doesn't seem likely to
> me...)
> 
>  src/OpenDis.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> b18713ec3f36a10b3cdb1e16f9550e1d2e05dff0
> diff --git a/src/OpenDis.c b/src/OpenDis.c
> index 199e978..f4949ee 100644
> --- a/src/OpenDis.c
> +++ b/src/OpenDis.c
> @@ -477,11 +477,8 @@ #endif /* USE_XCB */
>    	(void) strncpy(dpy->vendor, u.vendor, vendorlen);
>  	dpy->vendor[vendorlen] = '\0';
>   	vendorlen = (vendorlen + 3) & ~3;	/* round up */
> +	u.vendor += vendorlen;
>  
> -
> -	memmove (setup, u.vendor + vendorlen,
> -		 (int) setuplength - sz_xConnSetup - vendorlen);
> - 	u.vendor = setup;
>  /*
>   * Now iterate down setup information.....
>   */
> -- 
> 1.3.3
> _______________________________________________
> xorg mailing list
> xorg at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20060612/2a30a540/attachment.pgp>