Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index d6d3d8228901c93f6709c5a571c7fb65ffa05126..cb99bf27ad3f4367fb97529225db63a787fca405 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -17,20 +17,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include "config.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)
+/**
+ * Load the session from the specified filename.
+ *
+ * @param filename The name of the session file to load. Must not be NULL.
+ *
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments,
+ *         SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon
+ *         other errors.
+ */
+SR_API int sr_session_load(const char *filename)
 {
        GKeyFile *kf;
        GPtrArray *capturefiles;
@@ -43,7 +52,12 @@ int sr_session_load(const char *filename)
        int ret, err, probenum, devcnt, i, j;
        uint64_t tmp_u64, total_probes, enabled_probes, p;
        char **sections, **keys, *metafile, *val, c;
-       char probename[SR_MAX_PROBENAME_LEN];
+       char probename[SR_MAX_PROBENAME_LEN + 1];
+
+       if (!filename) {
+               sr_err("session file: %s: filename was NULL", __func__);
+               return SR_ERR_ARG;
+       }
 
        if (!(archive = zip_open(filename, 0, &err))) {
                sr_dbg("Failed to open session file: zip error %d", err);
@@ -144,6 +158,15 @@ int sr_session_load(const char *filename)
        return SR_OK;
 }
 
+/**
+ * Save the current session to the specified file.
+ *
+ * @param filename The name of the file where to save the current session.
+ *                 Must not be NULL.
+ *
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
+ *         upon other errors.
+ */
 int sr_session_save(const char *filename)
 {
        GSList *l, *p, *d;
@@ -157,6 +180,11 @@ int sr_session_save(const char *filename)
        uint64_t samplerate;
        char version[1], rawname[16], metafile[32], *buf, *s;
 
+       if (!filename) {
+               sr_err("session file: %s: filename was NULL", __func__);
+               return SR_ERR_ARG;
+       }
+
        /* Quietly delete it first, libzip wants replace ops otherwise. */
        unlink(filename);
        if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
@@ -202,7 +230,7 @@ int sr_session_save(const char *filename)
                                                device->plugin_index, SR_DI_CUR_SAMPLERATE));
                                s = sr_samplerate_string(samplerate);
                                fprintf(meta, "samplerate = %s\n", s);
-                               free(s);
+                               g_free(s);
                        }
                        probecnt = 1;
                        for (p = device->probes; p; p = p->next) {
@@ -217,8 +245,14 @@ int sr_session_save(const char *filename)
                        }
 
                        /* dump datastore into logic-n */
-                       buf = malloc(ds->num_units * ds->ds_unitsize +
+                       buf = g_try_malloc(ds->num_units * ds->ds_unitsize +
                                   DATASTORE_CHUNKSIZE);
+                       if (!buf) {
+                               sr_err("session file: %s: buf malloc failed",
+                                      __func__);
+                               return SR_ERR_MALLOC;
+                       }
+
                        bufcnt = 0;
                        for (d = ds->chunklist; d; d = d->next) {
                                memcpy(buf + bufcnt, d->data,