w32: Fix qemu_ftruncate64

Message ID 1313835005-32480-1-git-send-email-weil@mail.berlios.de
State Accepted
Headers show

Commit Message

Stefan Weil Aug. 20, 2011, 10:10 a.m.
SetFilePointer returns INVALID_SET_FILE_POINTER when it fails.
In addition, GetLastError must be checked.

The first call of SetFilePointer did not use INVALID_SET_FILE_POINTER,
the second call used wrong error handling.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 block/raw-win32.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Comments

Stefan Weil Aug. 20, 2011, 12:01 p.m. | #1
Am 20.08.2011 12:10, schrieb Stefan Weil:
> SetFilePointer returns INVALID_SET_FILE_POINTER when it fails.
> In addition, GetLastError must be checked.
>
> The first call of SetFilePointer did not use INVALID_SET_FILE_POINTER,
> the second call used wrong error handling.
>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>
> ---
>   block/raw-win32.c |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/block/raw-win32.c b/block/raw-win32.c
> index e47cfe0..b7dd357 100644
> --- a/block/raw-win32.c
> +++ b/block/raw-win32.c
> @@ -41,6 +41,7 @@ typedef struct BDRVRawState {
>   int qemu_ftruncate64(int fd, int64_t length)
>   {
>       LARGE_INTEGER li;
> +    DWORD dw;
>       LONG high;
>       HANDLE h;
>       BOOL res;
> @@ -53,12 +54,15 @@ int qemu_ftruncate64(int fd, int64_t length)
>       /* get current position, ftruncate do not change position */
>       li.HighPart = 0;
>       li.LowPart = SetFilePointer (h, 0,&li.HighPart, FILE_CURRENT);
> -    if (li.LowPart == 0xffffffffUL&&  GetLastError() != NO_ERROR)
> +    if (li.LowPart == INVALID_SET_FILE_POINTER&&  GetLastError() != NO_ERROR) {
>   	return -1;
> +    }
>
>       high = length>>  32;
> -    if (!SetFilePointer(h, (DWORD) length,&high, FILE_BEGIN))
> +    dw = SetFilePointer(h, (DWORD) length,&high, FILE_BEGIN);
> +    if (dw == INVALID_SET_FILE_POINTER&&  GetLastError() != NO_ERROR) {
>   	return -1;
> +    }
>       res = SetEndOfFile(h);
>
>       /* back to old position */

This is a bug fix, please apply it to git master and stable-0.15.

Thanks,
Stefan W.
Anthony Liguori Aug. 22, 2011, 4:32 p.m. | #2
On 08/20/2011 05:10 AM, Stefan Weil wrote:
> SetFilePointer returns INVALID_SET_FILE_POINTER when it fails.
> In addition, GetLastError must be checked.
>
> The first call of SetFilePointer did not use INVALID_SET_FILE_POINTER,
> the second call used wrong error handling.
>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   block/raw-win32.c |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/block/raw-win32.c b/block/raw-win32.c
> index e47cfe0..b7dd357 100644
> --- a/block/raw-win32.c
> +++ b/block/raw-win32.c
> @@ -41,6 +41,7 @@ typedef struct BDRVRawState {
>   int qemu_ftruncate64(int fd, int64_t length)
>   {
>       LARGE_INTEGER li;
> +    DWORD dw;
>       LONG high;
>       HANDLE h;
>       BOOL res;
> @@ -53,12 +54,15 @@ int qemu_ftruncate64(int fd, int64_t length)
>       /* get current position, ftruncate do not change position */
>       li.HighPart = 0;
>       li.LowPart = SetFilePointer (h, 0,&li.HighPart, FILE_CURRENT);
> -    if (li.LowPart == 0xffffffffUL&&  GetLastError() != NO_ERROR)
> +    if (li.LowPart == INVALID_SET_FILE_POINTER&&  GetLastError() != NO_ERROR) {
>   	return -1;
> +    }
>
>       high = length>>  32;
> -    if (!SetFilePointer(h, (DWORD) length,&high, FILE_BEGIN))
> +    dw = SetFilePointer(h, (DWORD) length,&high, FILE_BEGIN);
> +    if (dw == INVALID_SET_FILE_POINTER&&  GetLastError() != NO_ERROR) {
>   	return -1;
> +    }
>       res = SetEndOfFile(h);
>
>       /* back to old position */

Patch

diff --git a/block/raw-win32.c b/block/raw-win32.c
index e47cfe0..b7dd357 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -41,6 +41,7 @@  typedef struct BDRVRawState {
 int qemu_ftruncate64(int fd, int64_t length)
 {
     LARGE_INTEGER li;
+    DWORD dw;
     LONG high;
     HANDLE h;
     BOOL res;
@@ -53,12 +54,15 @@  int qemu_ftruncate64(int fd, int64_t length)
     /* get current position, ftruncate do not change position */
     li.HighPart = 0;
     li.LowPart = SetFilePointer (h, 0, &li.HighPart, FILE_CURRENT);
-    if (li.LowPart == 0xffffffffUL && GetLastError() != NO_ERROR)
+    if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
 	return -1;
+    }
 
     high = length >> 32;
-    if (!SetFilePointer(h, (DWORD) length, &high, FILE_BEGIN))
+    dw = SetFilePointer(h, (DWORD) length, &high, FILE_BEGIN);
+    if (dw == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
 	return -1;
+    }
     res = SetEndOfFile(h);
 
     /* back to old position */