← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/VMMDev/VMMDev.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/VMMDev/VMMDev.cpp
1489
1489
                    Log(("VMMDevReq_VideoSetVisibleRegion no rectangles!!!\n"));
1490
1490
                    pRequestHeader->rc = VERR_INVALID_PARAMETER;
1491
1491
                }
1492
 
                else
1493
 
                if (pRequestHeader->size != sizeof(VMMDevVideoSetVisibleRegion) + (ptr->cRect-1)*sizeof(RTRECT))
 
1492
                else if (   ptr->cRect > _1M /* restrict to sane range */
 
1493
                         || pRequestHeader->size != sizeof(VMMDevVideoSetVisibleRegion) + ptr->cRect * sizeof(RTRECT) - sizeof(RTRECT))
1494
1494
                {
1495
 
                    Log(("VMMDevReq_VideoSetVisibleRegion request size too small!!!\n"));
 
1495
                    Log(("VMMDevReq_VideoSetVisibleRegion: cRects=%#x doesn't match size=%#x or is out of bounds\n",
 
1496
                         ptr->cRect, pRequestHeader->size));
1496
1497
                    pRequestHeader->rc = VERR_INVALID_PARAMETER;
1497
1498
                }
1498
1499
                else