mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix default filename handling errors

Browse source 
The default filename handling is broken in two different ways:

 (a) if we start subsurface with a non-existing file, we warn about
the inability to read that file, and then we exit without setting the
default filename.

This is broken because it means that if the user (perhaps by mistake,
by pressing ^S) now saves the file, he will overwrite the default
filename, even though that was *not* the file we read, and *not* the
file that subsurface was started with.

So just set the default filename even for a failed file open.

The exact same logic is true of a failed parse of an XML file that we
successfully opened. We do *not* want to leave the old default
filename in place just because the XML parsing failed, and possibly
then overwriting some file that was never involved with that failure
in the first place. So just get rid of all the logic to push the
filename saving into the XML parsing layer, it has zero relevance at
that point.

 (b) if we do replace the default filename with a NULL file, we need
to set that even if we cannot do a strdup() on the NULL.

This fixes both errors.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2012-11-10 15:32:06 +01:00 committed by Dirk Hohndel
parent 080bcc10fc
commit 3d8c1e50fc
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dive.h
View file

@ -352,8 +352,7 @@ static inline struct dive *get_dive(int nr)
for ((_i) = 0; ((_x) = get_dive(_i)) != NULL; (_i)++)
extern void parse_xml_init(void);
extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error,
gboolean possible_default_filename);
extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error);
extern void parse_xml_exit(void);
extern void set_filename(const char *filename, gboolean force);

20
file.c
View file

@ -72,7 +72,7 @@ static void suunto_read(struct zip_file *file, GError **error)
size = read * 3 / 2;
mem = realloc(mem, size);
}
parse_xml_buffer(_("SDE file"), mem, read, error, FALSE);
parse_xml_buffer(_("SDE file"), mem, read, error);
free(mem);
}
#endif
@ -240,14 +240,13 @@ static int open_by_filename(const char *filename, const char *fmt, struct memblo
return 0;
}
static void parse_file_buffer(const char *filename, struct memblock *mem, GError **error,
gboolean possible_default_filename)
static void parse_file_buffer(const char *filename, struct memblock *mem, GError **error)
{
char *fmt = strrchr(filename, '.');
if (fmt && open_by_filename(filename, fmt+1, mem, error))
return;
parse_xml_buffer(filename, mem->buffer, mem->size, error, possible_default_filename);
parse_xml_buffer(filename, mem->buffer, mem->size, error);
}
void parse_file(const char *filename, GError **error, gboolean possible_default_filename)
@ -266,9 +265,20 @@ void parse_file(const char *filename, GError **error, gboolean possible_default_
_("Failed to read '%s'"),
filename);
}
/*
* We do *not* want to leave the old default_filename
* just because the open failed.
*/
if (possible_default_filename)
set_filename(filename, TRUE);
return;
}
parse_file_buffer(filename, &mem, error, possible_default_filename);
if (possible_default_filename)
set_filename(filename, TRUE);
parse_file_buffer(filename, &mem, error);
free(mem.buffer);
}

4
gtk-gui.c
View file

@ -1518,7 +1518,7 @@ static GError *setup_uemis_import(device_data_t *data)
#ifdef DEBUGFILE
fprintf(debugfile, "xml buffer \"%s\"\n\n", buf);
#endif
parse_xml_buffer("Uemis Download", buf, strlen(buf), &error, FALSE);
parse_xml_buffer("Uemis Download", buf, strlen(buf), &error);
set_uemis_last_dive(uemis_max_dive_data);
#if UEMIS_DEBUG
fprintf(debugfile, "uemis_max_dive_data: %s\n", uemis_max_dive_data);
@ -1672,4 +1672,6 @@ void set_filename(const char *filename, gboolean force)
free((void *)existing_filename);
if (filename)
existing_filename = strdup(filename);
else
existing_filename = NULL;
}

6
parse-xml.c
View file

@ -1485,8 +1485,7 @@ static void reset_all(void)
import_source = UNKNOWN;
}
void parse_xml_buffer(const char *url, const char *buffer, int size, GError **error,
gboolean possible_default_filename)
void parse_xml_buffer(const char *url, const char *buffer, int size, GError **error)
{
xmlDoc *doc;
@ -1502,9 +1501,6 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er
}
return;
}
/* remember, if necessary, that this is the filename to store to */
if (possible_default_filename)
set_filename(url, FALSE);
reset_all();
dive_start();
#ifdef XSLT