xserver: Branch 'master'

[Keith Packard]

On Tue, 2008-03-11 at 15:46 +0000, Bill Crawford wrote:
> On 11/03/2008, Daniel Stone <daniel at fooishbar.org> wrote:
> 
> >  > @@ -1830,6 +1831,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
> >  >                      dsection->doodads = NULL;
> >  >                  }
> >  >
> >  > +                dsection->sz_doodads = ssection->num_doodads;
> >
> >  If sz_doodads is set, you should be setting num_doodads for consistency,
> >  unless this is already covered by *dsection = *ssection.
> 
> We had that conversation on xorg-devel a few weeks ago :) it's
> supposed to be num_doodads there, as the alloc of the memory uses
> num_doodads for the element count.

The version I submitted is correct -- num_doodads is set in the global
structure assignment above (*dsection = *ssection).

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg/attachments/20080311/2d82cfd4/attachment.pgp>