X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=4d8568997d835205e8624dd9becef1f6c8f04362;hb=34dcc119fe899f98395cb97d847040d384a8b861;hp=82b10a47e741113428f20e7c671ee595e1442885;hpb=11495bbb2bba6e3cdb69078625dc7c90bc443c39;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 82b10a4..4d85689 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 #define __USE_XOPEN
 #include <time.h>
 #include <libxml/parser.h>
@@ -1417,11 +1419,70 @@ static void reset_all(void)
 	import_source = UNKNOWN;
 }
 
+struct memblock {
+	void *buffer;
+	size_t size;
+};
+
+static int readfile(const char *filename, struct memblock *mem)
+{
+	int ret, fd = open(filename, O_RDONLY);
+	struct stat st;
+
+	mem->buffer = NULL;
+	mem->size = 0;
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0)
+		return fd;
+	ret = fstat(fd, &st);
+	if (ret < 0)
+		goto out;
+	ret = -EINVAL;
+	if (!S_ISREG(st.st_mode))
+		goto out;
+	ret = 0;
+	if (!st.st_size)
+		goto out;
+	mem->buffer = malloc(st.st_size);
+	ret = -1;
+	errno = ENOMEM;
+	if (!mem->buffer)
+		goto out;
+	mem->size = st.st_size;
+	ret = read(fd, mem->buffer, mem->size);
+	if (ret < 0)
+		goto free;
+	if (ret == mem->size)
+		goto out;
+	errno = EIO;
+	ret = -1;
+free:
+	free(mem->buffer);
+	mem->buffer = NULL;
+	mem->size = 0;
+out:
+	close(fd);
+	return ret;
+}
+
 void parse_xml_file(const char *filename, GError **error)
 {
 	xmlDoc *doc;
+	struct memblock mem;
+
+	if (readfile(filename, &mem) < 0) {
+		fprintf(stderr, "Failed to read '%s'.\n", filename);
+		if (error) {
+			*error = g_error_new(g_quark_from_string("subsurface"),
+					     DIVE_ERROR_PARSE,
+					     "Failed to read '%s'",
+					     filename);
+		}
+		return;
+	}
 
-	doc = xmlReadFile(filename, NULL, 0);
+	doc = xmlReadMemory(mem.buffer, mem.size, filename, NULL, 0);
 	if (!doc) {
 		fprintf(stderr, "Failed to parse '%s'.\n", filename);
 		if (error != NULL)