Commit fd717e78 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-11-tag' into staging 



qemu-ga patch queue

* fix for unintended overwriting of data on w32 using
  guest-file-open with append mode

# gpg: Signature made Wed 11 Nov 2015 22:14:52 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2015-11-11-tag:
  qga: fix append file open modes for win32

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2048a2a4 52074d0f

qga/commands-win32.c

+15 −14
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static struct { 
    .filehandles = QTAILQ_HEAD_INITIALIZER(guest_file_state.filehandles),

};



#define FILE_GENERIC_APPEND (FILE_GENERIC_WRITE & ~FILE_WRITE_DATA)



typedef struct OpenFlags {

    const char *forms;
@@ -70,16 +71,16 @@ static OpenFlags guest_file_open_modes[] = { 
    {"rb",  GENERIC_READ,                     OPEN_EXISTING},

    {"w",   GENERIC_WRITE,                    CREATE_ALWAYS},

    {"wb",  GENERIC_WRITE,                    CREATE_ALWAYS},

    {"a",   GENERIC_WRITE,              OPEN_ALWAYS  },

    {"a",   FILE_GENERIC_APPEND,              OPEN_ALWAYS  },

    {"r+",  GENERIC_WRITE|GENERIC_READ,       OPEN_EXISTING},

    {"rb+", GENERIC_WRITE|GENERIC_READ,       OPEN_EXISTING},

    {"r+b", GENERIC_WRITE|GENERIC_READ,       OPEN_EXISTING},

    {"w+",  GENERIC_WRITE|GENERIC_READ,       CREATE_ALWAYS},

    {"wb+", GENERIC_WRITE|GENERIC_READ,       CREATE_ALWAYS},

    {"w+b", GENERIC_WRITE|GENERIC_READ,       CREATE_ALWAYS},

    {"a+",  GENERIC_WRITE|GENERIC_READ, OPEN_ALWAYS  },

    {"ab+", GENERIC_WRITE|GENERIC_READ, OPEN_ALWAYS  },

    {"a+b", GENERIC_WRITE|GENERIC_READ, OPEN_ALWAYS  }

    {"a+",  FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS  },

    {"ab+", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS  },

    {"a+b", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS  }

};



static OpenFlags *find_open_flag(const char *mode_str)