Attachment 3653 Details for Bug 4920 – Avoid compiler warning by using real unsigned char pointer for XGetWindowProperty

[patch] Avoid compiler warning by using real unsigned char pointer for XGetWindowProperty

libxkbfile-typepun-warning.patch (text/plain), 1.35 KB, created by Bill Crawford on 2005-10-28 11:27:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Crawford

Created: 2005-10-28 11:27:34 UTC

Size: 1.35 KB

patch

obsolete

>Index: xc/lib/xkbfile/maprules.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/xkbfile/maprules.c,v
>retrieving revision 1.5
>diff -u -r1.5 maprules.c
>--- xc/lib/xkbfile/maprules.c	3 Jul 2005 07:37:33 -0000	1.5
>+++ xc/lib/xkbfile/maprules.c	28 Oct 2005 18:08:04 -0000
>@@ -1360,7 +1360,8 @@
> Atom		rules_atom,actual_type;
> int		fmt;
> unsigned long	nitems,bytes_after;
>-char            *data,*out;
>+unsigned char   *data;
>+char            *out, *end;
> Status		rtrn;
> 
>     rules_atom= XInternAtom(dpy,_XKB_RF_NAMES_PROP_ATOM,True);
>@@ -1381,35 +1382,36 @@
> 	return (fmt==0?True:False);
>     }
> 
>-    out= data;
>+    out=(char*)data;
>+    end=out+nitems;
>     if (out && (*out) && rf_rtrn)
> 	 *rf_rtrn= _XkbDupString(out);
>     out+=strlen(out)+1;
> 
>-    if ((out-data)<nitems) {
>+    if (out<end) {
> 	if (*out)
> 	    vd_rtrn->model= _XkbDupString(out);
> 	out+=strlen(out)+1;
>     }
> 
>-    if ((out-data)<nitems) {
>+    if (out<end) {
> 	if (*out)
> 	    vd_rtrn->layout= _XkbDupString(out);
> 	out+=strlen(out)+1;
>     }
> 
>-    if ((out-data)<nitems) {
>+    if (out<end) {
> 	if (*out)
> 	    vd_rtrn->variant= _XkbDupString(out);
> 	out+=strlen(out)+1;
>     }
> 
>-
>-    if ((out-data)<nitems) {
>+    if (out<end) {
> 	if (*out)
> 	    vd_rtrn->options= _XkbDupString(out);
> 	out+=strlen(out)+1;
>     }
>+
>     XFree(data);
>     return True;
> }

Actions: View | Splinter Review

Attachments on bug 4920: 3653

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.