+minor sanity checks

diff --git a/src/client/cmdline/cmd_get.c b/src/client/cmdline/cmd_get.c
index 18ae8c6..9f30320 100644 (file)
--- a/src/client/cmdline/cmd_get.c
+++ b/src/client/cmdline/cmd_get.c
@@ -111,6 +111,7 @@ ssize_t gotssize;
                                transfer_buffer,        /* buffer */
                                sizeof(transfer_buffer),        /* num_bytes */
                                &bytes_read);   /* bytes_read_return */
+               g_assert(errvfsresult==GNOME_VFS_OK || errvfsresult==GNOME_VFS_ERROR_EOF);
                g_assert((errvfsresult==GNOME_VFS_ERROR_EOF)==(bytes_read==0));
                if (errvfsresult==GNOME_VFS_ERROR_EOF)
                        break;

diff --git a/src/libcaptive/client/file.c b/src/libcaptive/client/file.c
index 8ae9204..f1f5c3a 100644 (file)
--- a/src/libcaptive/client/file.c
+++ b/src/libcaptive/client/file.c
@@ -283,6 +283,7 @@ GnomeVFSResult errvfsresult;
                *bytes_read_return=0;
                return GNOME_VFS_ERROR_EOF;
                }
+       g_return_val_if_fail(file_IoStatusBlock.Information>0,GNOME_VFS_ERROR_GENERIC); /* if not STATUS_END_OF_FILE... */
        if (GNOME_VFS_OK!=(errvfsresult=captive_NTSTATUS_to_GnomeVFSResult(err)))
                return errvfsresult;
        g_return_val_if_fail(NT_SUCCESS(err)==NT_SUCCESS(file_IoStatusBlock.Status),GNOME_VFS_ERROR_GENERIC);