← Back to branch summary

~ubuntu-branches/ubuntu/utopic/freerdp/utopic

« back to all changes in this revision

Viewing changes to libfreerdp-core/activation.c

  • Committer: Package Import Robot
  • Author(s): Otavio Salvador, Jeremy Bicha
  • Date: 2012-02-11 10:34:05 UTC
  • mfrom: (1.1.7) (9.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120211103405-mk0gjhjn70eeyxul
Tags: 1.0.1-1
http://bugs.debian.org/659332
[ Jeremy Bicha ]
* New upstream release. Closes: #659332.
* Updated symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfreerdp-core/activation.c
277
277
{
278
278
        uint16 lengthSourceDescriptor;
279
279
 
280
 
        stream_read_uint32(s, rdp->settings->share_id); /* shareId (4 bytes) */
281
 
        stream_read_uint16(s, lengthSourceDescriptor); /* lengthSourceDescriptor (2 bytes) */
282
 
        stream_seek(s, lengthSourceDescriptor); /* sourceDescriptor (should be 0x00) */
 
280
        /*
 
281
         * Windows XP can send short DEACTIVATE_ALL PDU that doesn't contain
 
282
         * the following fields.
 
283
         */
 
284
        if (stream_get_left(s) > 0)
 
285
        {
 
286
                stream_read_uint32(s, rdp->settings->share_id); /* shareId (4 bytes) */
 
287
                stream_read_uint16(s, lengthSourceDescriptor); /* lengthSourceDescriptor (2 bytes) */
 
288
                stream_seek(s, lengthSourceDescriptor); /* sourceDescriptor (should be 0x00) */
 
289
        }
283
290
 
284
291
        rdp->state = CONNECTION_STATE_CAPABILITY;
285
292
 
287
294
        {
288
295
                if (rdp_check_fds(rdp) < 0)
289
296
                        return false;
 
297
                if (rdp->disconnect)
 
298
                        break;
290
299
        }
291
300
 
292
301
        return true;