← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
29
29
*   Header Files                                                               *
30
30
*******************************************************************************/
31
31
#include <iprt/string.h>
32
 
#include <iprt/mem.h>
 
32
#ifndef VBOX_VBGLR3_XFREE86
 
33
# include <iprt/mem.h>
 
34
#endif
33
35
#include <iprt/assert.h>
34
 
#include <iprt/cpp/autores.h>
35
36
#include <iprt/stdarg.h>
36
37
#include <VBox/log.h>
37
38
#include <VBox/HostServices/GuestPropertySvc.h>
642
643
            rc = VERR_NO_MEMORY;
643
644
            break;
644
645
        }
 
646
        memset(Buf.get(), 0, cchBuf);
645
647
        rc = VbglR3GuestPropEnumRaw(u32ClientId, Patterns.get(),
646
648
                                    Buf.get(), cchBuf, &cchBuf);
647
649
        if (rc != VERR_BUFFER_OVERFLOW)