X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=0e3c56bec13be086a4cf7ce10f725c17363773a2;hb=d3b1b51cbef3edfeefbc5b9edfdd8423c6d5e8e0;hp=4d70b3514e92404dc49e7c9fa78271f0a78c918f;hpb=8225e92175c64909eddaecf8bd512049acf653a2;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index 4d70b351..0e3c56be 100644
--- a/session_file.c
+++ b/session_file.c
@@ -25,11 +25,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
-
 int sr_session_load(const char *filename)
 {
 	GKeyFile *kf;
@@ -45,35 +45,40 @@ int sr_session_load(const char *filename)
 	char **sections, **keys, *metafile, *val, c;
 
 	if (!(archive = zip_open(filename, 0, &err))) {
-		g_debug("Failed to open session file: zip error %d", err);
+		sr_dbg("Failed to open session file: zip error %d", err);
 		return SR_ERR;
 	}
 
 	/* check "version" */
 	if (!(zf = zip_fopen(archive, "version", 0))) {
-		g_debug("Not a sigrok session file.");
+		sr_dbg("Not a sigrok session file.");
 		return SR_ERR;
 	}
 	ret = zip_fread(zf, &c, 1);
 	if (ret != 1 || c != '1') {
-		g_debug("Not a valid sigrok session file.");
+		sr_dbg("Not a valid sigrok session file.");
 		return SR_ERR;
 	}
 	zip_fclose(zf);
 
 	/* read "metadata" */
 	if (zip_stat(archive, "metadata", 0, &zs) == -1) {
-		g_debug("Not a valid sigrok session file.");
+		sr_dbg("Not a valid sigrok session file.");
 		return SR_ERR;
 	}
-	metafile = g_malloc(zs.size);
+
+	if (!(metafile = g_try_malloc(zs.size))) {
+		sr_err("session file: %s: metafile malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
 	zf = zip_fopen_index(archive, zs.index, 0);
 	zip_fread(zf, metafile, zs.size);
 	zip_fclose(zf);
 
 	kf = g_key_file_new();
 	if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) {
-		g_debug("Failed to parse metadata.");
+		sr_dbg("Failed to parse metadata.");
 		return SR_ERR;
 	}
 
@@ -159,8 +164,8 @@ int sr_session_save(const char *filename)
 	if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
 		return SR_ERR;
 	if (zip_add(zipfile, "version", versrc) == -1) {
-		g_message("error saving version into zipfile: %s",
-			  zip_strerror(zipfile));
+		sr_info("error saving version into zipfile: %s",
+			zip_strerror(zipfile));
 		return SR_ERR;
 	}
 
@@ -234,7 +239,7 @@ int sr_session_save(const char *filename)
 		return SR_ERR;
 
 	if ((ret = zip_close(zipfile)) == -1) {
-		g_message("error saving zipfile: %s", zip_strerror(zipfile));
+		sr_info("error saving zipfile: %s", zip_strerror(zipfile));
 		return SR_ERR;
 	}
 
@@ -242,4 +247,3 @@ int sr_session_save(const char *filename)
 
 	return SR_OK;
 }
-