X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Fguestmount.c;h=baf2b6675dbadf92e10b5b343195491bfa5c88dc;hb=52390cde840925d4f7e194fcafa7963ad7a2ec04;hp=ba0d626ca66ce1276f95258907555bb1adf22d49;hpb=336275ee6dbff5efa2152a4f67ef354b81d15d59;p=libguestfs.git diff --git a/fuse/guestmount.c b/fuse/guestmount.c index ba0d626..baf2b66 100644 --- a/fuse/guestmount.c +++ b/fuse/guestmount.c @@ -620,14 +620,8 @@ fg_read (const char *path, char *buf, size_t size, off_t offset, if (size > limit) size = limit; - /* Note the correct error handling here is tricky, because in the - * case where the call returns a zero-length buffer, it might return - * NULL. However it won't adjust rsize along the error path, so we - * can set rsize to something beforehand and use that as a flag. - */ - rsize = 1; r = guestfs_pread (g, path, size, offset, &rsize); - if (rsize == 1 && r == NULL) + if (r == NULL) return error (); /* This should never happen, but at least it stops us overflowing