From a0220f786cfbbf088f8ecc8fac797dab643edb77 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 5 Nov 2008 01:09:44 +0000 Subject: [PATCH] minor vfs tweaks --- dtool/src/prc/streamReader.cxx | 7 +++++-- panda/src/express/virtualFileSimple.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dtool/src/prc/streamReader.cxx b/dtool/src/prc/streamReader.cxx index 13f0428a14..4cb7ad58f2 100644 --- a/dtool/src/prc/streamReader.cxx +++ b/dtool/src/prc/streamReader.cxx @@ -115,11 +115,14 @@ skip_bytes(size_t size) { // Function: StreamReader::extract_bytes // Access: Published // Description: Extracts the indicated number of bytes in the -// stream and returns them as a string. +// stream and returns them as a string. Returns empty +// string at end-of-file. //////////////////////////////////////////////////////////////////// string StreamReader:: extract_bytes(size_t size) { - nassertr(!_in->eof() && !_in->fail(), string()); + if (_in->eof() || _in->fail()) { + return string(); + } char *buffer = (char *)alloca(size); _in->read(buffer, size); diff --git a/panda/src/express/virtualFileSimple.h b/panda/src/express/virtualFileSimple.h index 12e00204aa..b9134d3089 100644 --- a/panda/src/express/virtualFileSimple.h +++ b/panda/src/express/virtualFileSimple.h @@ -32,6 +32,7 @@ public: const Filename &local_filename, bool implicit_pz_file); +PUBLISHED: virtual VirtualFileSystem *get_file_system() const; INLINE VirtualFileMount *get_mount() const; virtual Filename get_filename() const;