X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=637e647edc7e5dcc80ac10d5714377ff2430dcae;hb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;hp=c8939e5f300b6a4c4f885314f7afa1f8f87d56e4;hpb=f5a443f27ad0e99f8f0f93867a1f298d7a6a327a;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index c8939e5f..637e647e 100644
--- a/session_file.c
+++ b/session_file.c
@@ -24,8 +24,8 @@
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
@@ -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;
 	}
 
@@ -102,7 +107,7 @@ int sr_session_load(const char *filename)
 					device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
-					tmp_u64 = sr_parse_sizestring(val);
+					sr_parse_sizestring(val, &tmp_u64);
 					device->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64);
 				} else if (!strcmp(keys[j], "unitsize")) {
 					tmp_u64 = strtoull(val, NULL, 10);
@@ -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;
 	}