sr: session: Use realloc to resize source array

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 89ea5ad4adf18312698c80a829dee5e4a16c1e31..2dc3c43cfaa868b99869fdffc616593190980878 100644 (file)
--- a/session.c
+++ b/session.c
@@ -505,18 +505,12 @@ SR_API int sr_session_source_add(int fd, int events, int timeout,
 
        /* Note: cb_data can be NULL, that's not a bug. */
 
-       new_sources = g_try_malloc0(sizeof(struct source) * (num_sources + 1));
+       new_sources = g_try_realloc(sources, sizeof(struct source) * (num_sources + 1));
        if (!new_sources) {
                sr_err("session: %s: new_sources malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
-       if (sources) {
-               memcpy(new_sources, sources,
-                      sizeof(struct source) * num_sources);
-               g_free(sources);
-       }
-
        s = &new_sources[num_sources++];
        s->fd = fd;
        s->events = events;
@@ -553,28 +547,29 @@ SR_API int sr_session_source_remove(int fd)
                return SR_ERR_BUG;
        }
 
-       /* TODO: Check if 'fd' valid. */
-
-       new_sources = g_try_malloc0(sizeof(struct source) * num_sources);
-       if (!new_sources) {
-               sr_err("session: %s: new_sources malloc failed", __func__);
-               return SR_ERR_MALLOC;
+       for (old = 0; old < num_sources; old++) {
+               if (sources[old].fd == fd)
+                       break;
        }
 
-       for (old = 0, new = 0; old < num_sources; old++) {
-               if (sources[old].fd != fd)
-                       memcpy(&new_sources[new++], &sources[old],
-                              sizeof(struct source));
+       /* fd not found, nothing to do */
+       if (old == num_sources)
+               return SR_OK;
+
+       num_sources -= 1;
+
+       if (old != num_sources) {
+               memmove(&sources[old], &sources[old+1],
+                       (num_sources - old) * sizeof(struct source));
        }
 
-       if (old != new) {
-               g_free(sources);
-               sources = new_sources;
-               num_sources--;
-       } else {
-               /* Target fd was not found. */
-               g_free(new_sources);
+       new_sources = g_try_realloc(sources, sizeof(struct source) * (num_sources - 1));
+       if (!new_sources && num_sources > 0) {
+               sr_err("session: %s: new_sources malloc failed", __func__);
+               return SR_ERR_MALLOC;
        }
 
+       sources = new_sources;
+
        return SR_OK;
 }