Fix a couple of robustness issues.

[originally from svn r5873]
This commit is contained in:
Simon Tatham
2005-05-31 08:56:33 +00:00
parent 2698fc9e9e
commit 412344ff9a
2 changed files with 6 additions and 2 deletions

6
gtk.c
View File

@ -1011,7 +1011,11 @@ static frontend *new_window(char *game_id, char **error)
fe = snew(frontend); fe = snew(frontend);
fe->timer_active = FALSE;
fe->timer_id = -1;
fe->me = midend_new(fe, &thegame); fe->me = midend_new(fe, &thegame);
if (game_id) { if (game_id) {
*error = midend_game_id(fe->me, game_id); *error = midend_game_id(fe->me, game_id);
if (*error) { if (*error) {
@ -1200,8 +1204,6 @@ static frontend *new_window(char *game_id, char **error)
fe->fonts = NULL; fe->fonts = NULL;
fe->nfonts = fe->fontsize = 0; fe->nfonts = fe->fontsize = 0;
fe->timer_active = FALSE;
fe->paste_data = NULL; fe->paste_data = NULL;
fe->paste_data_len = 0; fe->paste_data_len = 0;

View File

@ -2089,6 +2089,8 @@ static game_state *new_game(midend_data *me, game_params *params, char *desc)
state->layout->me = me; state->layout->me = me;
} else { } else {
state->layout->rs = NULL;
state->layout->me = NULL;
state->layout->mines = snewn(wh, char); state->layout->mines = snewn(wh, char);
x = atoi(desc); x = atoi(desc);