Fix: set session should not set not-existent session
Merged in master, stable-2.7, stable-2.6 and stable-2.5. Thanks!
Jérémie
Quoted 70 lines · Partha Pratim Mukherjee
set session does not check the existence of a session before setting it as the current session. Fix it so that it gives error for not-existent session.
Fixes #885Signed-off-by Partha Pratim Mukherjee <[email protected]>--- src/bin/lttng/commands/set_session.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)src/bin/lttng/commands/set_session.c +23
-0@@ -106,11 +106,34 @@ end:static int set_session (void ) {int ret =CMD_SUCCESS ; +int count, i; +unsigned int session_found =0 ; +struct lttng_session *sessions;if (opt_session_name &&strlen (opt_session_name) >NAME_MAX ) { ERR("Session name too long. Length must be lower or equal to %d",NAME_MAX ); ret =CMD_ERROR ; + goto end; + } + + count =lttng_list_sessions (&sessions); +if (count <0 ) { + ret =CMD_ERROR ; +ERR ("%s" ,lttng_strerror (count)); + goto end; + } + +for (i =0 ; i < count; i++) { +if (strncmp (sessions[i].name, opt_session_name,NAME_MAX ) ==0 ) { + session_found =1 ; +break ; + } + } + +if (!session_found) { +ERR ("Session '%s' not found" , opt_session_name); + ret =CMD_ERROR ; goto error;}src/bin/lttng/commands/set_session.c +2
-1@@ -133,6 +156,8 @@ static int set_session(void) ret =CMD_SUCCESS ; error: +free (sessions); +end:return ret; } --1.7.10.4
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev