~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to Xi/xipassivegrab.c

Tags: 2:1.10.1-2
* Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
118
118
        return BadValue;
119
119
    }
120
120
 
121
 
    if (XICheckInvalidMaskBits((unsigned char*)&stuff[1],
 
121
    if (XICheckInvalidMaskBits(client, (unsigned char*)&stuff[1],
122
122
                               stuff->mask_len * 4) != Success)
123
123
        return BadValue;
124
124
 
194
194
            info->status = status;
195
195
            info->modifiers = *modifiers;
196
196
            rep.num_modifiers++;
197
 
            rep.length++;
 
197
            rep.length += bytes_to_int32(sizeof(xXIGrabModifierInfo));
198
198
        }
199
199
    }
200
200
 
202
202
    if (rep.num_modifiers)
203
203
    {
204
204
        client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
205
 
        WriteSwappedDataToClient(client, rep.num_modifiers * 4, (char*)modifiers_failed);
 
205
        WriteSwappedDataToClient(client, rep.length * 4, (char*)modifiers_failed);
206
206
    }
207
207
    free(modifiers_failed);
208
208
    return ret;