|
|
0f3735e |
From 3c61cf9ff02dcebc22f97778d4806db144c15eb9 Mon Sep 17 00:00:00 2001
|
|
|
0f3735e |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
0f3735e |
Date: Thu, 12 Nov 2015 10:31:17 +0100
|
|
|
0f3735e |
Subject: [PATCH 1/7] Don't crash on file open failures
|
|
|
0f3735e |
|
|
|
0f3735e |
---
|
|
|
0f3735e |
src/basecode/angelcodefont.cpp | 2 +-
|
|
|
0f3735e |
src/core/simutils.cpp | 2 +-
|
|
|
0f3735e |
src/include/fileutils.h | 2 +-
|
|
|
0f3735e |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
0f3735e |
|
|
|
0f3735e |
diff --git a/src/basecode/angelcodefont.cpp b/src/basecode/angelcodefont.cpp
|
|
|
0f3735e |
index d109d0e..77d4d9a 100644
|
|
|
0f3735e |
--- a/src/basecode/angelcodefont.cpp
|
|
|
0f3735e |
+++ b/src/basecode/angelcodefont.cpp
|
|
|
0f3735e |
@@ -209,7 +209,7 @@ void ACFont::load(const char *filename)
|
|
|
0f3735e |
|
|
|
0f3735e |
void ACFont::load(File * f)
|
|
|
0f3735e |
{
|
|
|
0f3735e |
- if (f == NULL) return;
|
|
|
0f3735e |
+ if (f->f == NULL) return;
|
|
|
0f3735e |
if (f->readbyte() != 0x42) return; // B
|
|
|
0f3735e |
if (f->readbyte() != 0x4d) return; // M
|
|
|
0f3735e |
if (f->readbyte() != 0x46) return; // F
|
|
|
0f3735e |
diff --git a/src/core/simutils.cpp b/src/core/simutils.cpp
|
|
|
0f3735e |
index 3f90dc9..bc8a0bb 100644
|
|
|
0f3735e |
--- a/src/core/simutils.cpp
|
|
|
0f3735e |
+++ b/src/core/simutils.cpp
|
|
|
0f3735e |
@@ -461,7 +461,7 @@ void do_flush_boxloadqueue()
|
|
|
0f3735e |
gBoxLoadQueue.pop_back();
|
|
|
0f3735e |
gBoxBeingLoaded = item->mBox;
|
|
|
0f3735e |
File *bf = do_preload_box(item->mFilename);
|
|
|
0f3735e |
- if (bf == NULL)
|
|
|
0f3735e |
+ if (bf->f == NULL)
|
|
|
0f3735e |
{
|
|
|
0f3735e |
// pretty catastrophic, but we'll do what we can..
|
|
|
0f3735e |
gBoxBeingLoaded = NULL;
|
|
|
0f3735e |
diff --git a/src/include/fileutils.h b/src/include/fileutils.h
|
|
|
0f3735e |
index 04f164e..bd1ca61 100644
|
|
|
0f3735e |
--- a/src/include/fileutils.h
|
|
|
0f3735e |
+++ b/src/include/fileutils.h
|
|
|
0f3735e |
@@ -28,8 +28,8 @@ using namespace std;
|
|
|
0f3735e |
|
|
|
0f3735e |
class File
|
|
|
0f3735e |
{
|
|
|
0f3735e |
- FILE * f;
|
|
|
0f3735e |
public:
|
|
|
0f3735e |
+ FILE * f;
|
|
|
0f3735e |
File();
|
|
|
0f3735e |
File(FILE *aFileHandle);
|
|
|
0f3735e |
File(const char *aFilename, const char *aFileOpenTypes);
|
|
|
0f3735e |
--
|
|
|
0f3735e |
2.5.0
|
|
|
0f3735e |
|