projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: double put on error path
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 87a22c525d0553e2d0df91d2743c1f9c88f9d939..7f091c2b792891f523a22aad61a60749869d8be1 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-2286,8
+2286,13
@@
static int relay_recv_index(const struct lttcomm_relayd_hdr *recv_hdr,
/* no flush. */
ret = 0;
} else {
/* no flush. */
ret = 0;
} else {
+ /*
+ * ret < 0
+ *
+ * relay_index_try_flush is responsible for the self-reference
+ * put of the index object on error.
+ */
ERR("relay_index_try_flush error %d", ret);
ERR("relay_index_try_flush error %d", ret);
- relay_index_put(index);
ret = -1;
}
ret = -1;
}
@@
-2691,9
+2696,13
@@
static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
/* No flush. */
ret = 0;
} else {
/* No flush. */
ret = 0;
} else {
- /* Put self-ref for this index due to error. */
- relay_index_put(index);
- index = NULL;
+ /*
+ * ret < 0
+ *
+ * relay_index_try_flush is responsible for the self-reference
+ * put of the index object on error.
+ */
+ ERR("relay_index_try_flush error %d", ret);
ret = -1;
}
end:
ret = -1;
}
end:
This page took
0.025206 seconds
and
5
git commands to generate.