Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

fix highly theoretical source of crash.

Browse source 
bind_eressea now checks if bindings were called without filename
This commit is contained in:
Enno Rehling 2021-03-15 20:00:58 +01:00
parent 56141ee7a1
commit 36653ec65b
2 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/bind_eressea.c
View file

@ -28,16 +28,23 @@ void eressea_free_game(void) {
} }
int eressea_read_game(const char * filename) { int eressea_read_game(const char * filename) {
if (filename) {
return readgame(filename); return readgame(filename);
}
return -1;
} }
int eressea_write_game(const char * filename) { int eressea_write_game(const char * filename) {
if (filename) {
remove_empty_factions(); remove_empty_factions();
return writegame(filename); return writegame(filename);
}
return -1;
} }
int eressea_read_orders(const char * filename) { int eressea_read_orders(const char * filename) {
FILE * F = fopen(filename, "r"); if (filename) {
FILE *F = fopen(filename, "r");
int result; int result;
if (!F) { if (!F) {
@ -48,9 +55,12 @@ int eressea_read_orders(const char * filename) {
result = parseorders(F); result = parseorders(F);
fclose(F); fclose(F);
return result; return result;
}
return -1;
} }
int eressea_export_json(const char * filename, int flags) { int eressea_export_json(const char * filename, int flags) {
if (filename) {
FILE *F = fopen(filename, "w"); FILE *F = fopen(filename, "w");
if (F) { if (F) {
stream out = { 0 }; stream out = { 0 };
@ -61,10 +71,12 @@ int eressea_export_json(const char * filename, int flags) {
return err; return err;
} }
perror(filename); perror(filename);
}
return -1; return -1;
} }
int eressea_import_json(const char * filename) { int eressea_import_json(const char * filename) {
if (filename) {
FILE *F = fopen(filename, "r"); FILE *F = fopen(filename, "r");
if (F) { if (F) {
stream out = { 0 }; stream out = { 0 };
@ -75,5 +87,6 @@ int eressea_import_json(const char * filename) {
return err; return err;
} }
perror(filename); perror(filename);
}
return -1; return -1;
} }

2
src/volcano.c
View file

@ -80,7 +80,7 @@ int volcano_damage(unit* u, const char* dice)
{ {
int hp = u->hp / u->number; int hp = u->hp / u->number;
int remain = u->hp % u->number; int remain = u->hp % u->number;
int ac, i, dead = 0, total = 0; int ac = 0, i, dead = 0, total = 0;
int healings = 0; int healings = 0;
const struct race* rc_cat = get_race(RC_CAT); const struct race* rc_cat = get_race(RC_CAT);
int protect = inside_building(u) ? (building_protection(u->building) + 1) : 0; int protect = inside_building(u) ? (building_protection(u->building) + 1) : 0;