← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freerdp/trusty-proposed

« back to all changes in this revision

Viewing changes to libfreerdp-core/update.c

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2012-11-16 23:08:42 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20121116230842-mnisn295dk1b0nzi
Tags: 1.0.1-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control, debian/rules: Drop avcodec/ffmpeg support
  - debian/patches/remote-control.diff: Fix crash in Remote Control
  - debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
    Fix freerdp extension handling problem.
  - debian/patches/backport-from-stdin.patch: Add --from-stdin
  - debian/patches/allow-null-domain.patch: Allow null domains from stdin
* debian/patches/cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879:
  - Dropped, included in Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfreerdp-core/update.c
175
175
        stream_read_uint16(s, pointer_color->lengthAndMask); /* lengthAndMask (2 bytes) */
176
176
        stream_read_uint16(s, pointer_color->lengthXorMask); /* lengthXorMask (2 bytes) */
177
177
 
 
178
        /**
 
179
         * There does not seem to be any documentation on why
 
180
         * xPos / yPos can be larger than width / height
 
181
         * so it is missing in documentation or a bug in implementation
 
182
         * 2.2.9.1.1.4.4 Color Pointer Update (TS_COLORPOINTERATTRIBUTE)
 
183
         */
 
184
        if (pointer_color->xPos >= pointer_color->width)
 
185
                pointer_color->xPos = 0;
 
186
        if (pointer_color->yPos >= pointer_color->height)
 
187
                pointer_color->yPos = 0;
 
188
 
178
189
        if (pointer_color->lengthXorMask > 0)
179
190
        {
180
191
                pointer_color->xorMaskData = (uint8*) xmalloc(pointer_color->lengthXorMask);