projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: unchecked return value in relayd live.c
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
session.c
diff --git
a/src/bin/lttng-relayd/session.c
b/src/bin/lttng-relayd/session.c
index 2300e5f1adab5c6c2190af4829cb9c2767f3e2f3..9702bd220b0d134bc4502ecd6e4435e682e22ba1 100644
(file)
--- a/
src/bin/lttng-relayd/session.c
+++ b/
src/bin/lttng-relayd/session.c
@@
-17,7
+17,6
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <common/common.h>
#include <urcu/rculist.h>
#define _LGPL_SOURCE
#include <common/common.h>
#include <urcu/rculist.h>
@@
-47,11
+46,16
@@
struct relay_session *session_create(const char *session_name,
PERROR("relay session zmalloc");
goto error;
}
PERROR("relay session zmalloc");
goto error;
}
-
+ if (lttng_strncpy(session->session_name, session_name,
+ sizeof(session->session_name))) {
+ goto error;
+ }
+ if (lttng_strncpy(session->hostname, hostname,
+ sizeof(session->hostname))) {
+ goto error;
+ }
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
- free(session);
- session = NULL;
goto error;
}
goto error;
}
@@
-68,17
+72,15
@@
struct relay_session *session_create(const char *session_name,
pthread_mutex_init(&session->reflock, NULL);
pthread_mutex_init(&session->recv_list_lock, NULL);
pthread_mutex_init(&session->reflock, NULL);
pthread_mutex_init(&session->recv_list_lock, NULL);
- strncpy(session->session_name, session_name,
- sizeof(session->session_name));
- strncpy(session->hostname, hostname,
- sizeof(session->hostname));
session->live_timer = live_timer;
session->snapshot = snapshot;
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
session->live_timer = live_timer;
session->snapshot = snapshot;
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
+ return session;
error:
error:
- return session;
+ free(session);
+ return NULL;
}
/* Should be called with RCU read-side lock held. */
}
/* Should be called with RCU read-side lock held. */
@@
-231,6
+233,10
@@
void print_sessions(void)
struct lttng_ht_iter iter;
struct relay_session *session;
struct lttng_ht_iter iter;
struct relay_session *session;
+ if (!sessions_ht) {
+ return;
+ }
+
rcu_read_lock();
cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
session_n.node) {
rcu_read_lock();
cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
session_n.node) {
This page took
0.026815 seconds
and
5
git commands to generate.