← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtualbox/quantal

« back to all changes in this revision

Viewing changes to src/VBox/HostServices/GuestProperties/service.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-04-05 12:41:55 UTC
  • mfrom: (3.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120405124155-i7b39tv5ddwhubbe
Tags: 4.1.12-dfsg-2
http://bugs.debian.org/667460
* Upstream has replaced the 4.1.12 tarball with a new one that fixes a
  crash when creating host only interfaces. (Closes: #667460)
  - Add 36-tarball-respin.patch which contains the diff between the old
    and the new tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostServices/GuestProperties/service.cpp
776
776
    if (rc == VINF_SUCCESS && pProp)
777
777
    {
778
778
        uint64_t u64Timestamp = getCurrentTimestamp();
779
 
        bool fRc = RTStrSpaceRemove(&mhProperties, pProp->mStrCore.pszString);
780
 
        Assert(fRc); NOREF(fRc);
 
779
        PRTSTRSPACECORE pStrCore = RTStrSpaceRemove(&mhProperties, pProp->mStrCore.pszString);
 
780
        AssertPtr(pStrCore); NOREF(pStrCore);
781
781
        mcProperties--;
782
782
        delete pProp;
783
783
        // if (isGuest)  /* Notify the host even for properties that the host
792
792
/**
793
793
 * Enumeration data shared between enumPropsCallback and Service::enumProps.
794
794
 */
795
 
typedef struct EnumData
 
795
typedef struct ENUMDATA
796
796
{
797
797
    const char *pszPattern; /**< The pattern to match properties against. */
798
798
    char       *pchCur;     /**< The current buffer postion. */
799
799
    size_t      cbLeft;     /**< The amount of available buffer space. */
800
800
    size_t      cbNeeded;   /**< The amount of needed buffer space. */
801
 
} EnumData;
 
801
} ENUMDATA;
802
802
 
803
803
/**
804
804
 * @callback_method_impl{FNRTSTRSPACECALLBACK}
806
806
static DECLCALLBACK(int) enumPropsCallback(PRTSTRSPACECORE pStr, void *pvUser)
807
807
{
808
808
    Property *pProp = (Property *)pStr;
809
 
    EnumData *pEnum = (EnumData *)pvUser;
 
809
    ENUMDATA *pEnum = (ENUMDATA *)pvUser;
810
810
 
811
811
    /* Included in the enumeration? */
812
812
    if (!pProp->Matches(pEnum->pszPattern))
904
904
     */
905
905
    if (RT_SUCCESS(rc))
906
906
    {
907
 
        EnumData EnumData;
 
907
        ENUMDATA EnumData;
908
908
        EnumData.pszPattern = szPatterns;
909
909
        EnumData.pchCur     = pchBuf;
910
910
        EnumData.cbLeft     = cbBuf;