CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <[EMAIL PROTECTED]> 05/04/21 20:16:32
Modified files:
src : filesystem.cpp
Log message:
Fix bug #12698: segfault on --decompress. When decompressing, the
virtual filesystem is not initialized, since loading game data is not
necessary, hence the segfault.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
Patches:
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.68 wesnoth/src/filesystem.cpp:1.69
--- wesnoth/src/filesystem.cpp:1.68 Sun Apr 17 20:42:10 2005
+++ wesnoth/src/filesystem.cpp Thu Apr 21 20:16:32 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.68 2005/04/17 20:42:10 gruikya Exp $ */
+/* $Id: filesystem.cpp,v 1.69 2005/04/21 20:16:32 silene Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -499,7 +499,7 @@
{
LOG_G << "Streaming " << fname << " for reading.\n";
#ifdef USE_ZIPIOS
- if (!fname.empty() && fname[0] != '/') {
+ if (!fname.empty() && fname[0] != '/' && the_collection) {
zipios::ConstEntryPointer p = the_collection->getEntry(fname);
if (p != 0)
if (std::istream *s = the_collection->getInputStream(p))
