projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: comparing array against NULL
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 528665a141680d70d94bb979f5c76583bf454790..cbf2bceff27908a164128ce27328459b4e5cfadf 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-754,7
+754,7
@@
static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
/* Setup kernel consumer socket and send fds to it */
ret = init_kernel_tracing(ksess);
/* Setup kernel consumer socket and send fds to it */
ret = init_kernel_tracing(ksess);
- if (ret
<
0) {
+ if (ret
!=
0) {
ret = LTTNG_ERR_KERN_START_FAIL;
goto error;
}
ret = LTTNG_ERR_KERN_START_FAIL;
goto error;
}
@@
-1831,7
+1831,7
@@
int cmd_register_consumer(struct ltt_session *session, int domain,
const char *sock_path, struct consumer_data *cdata)
{
int ret, sock;
const char *sock_path, struct consumer_data *cdata)
{
int ret, sock;
- struct consumer_socket *socket;
+ struct consumer_socket *socket
= NULL
;
assert(session);
assert(cdata);
assert(session);
assert(cdata);
@@
-1891,9
+1891,12
@@
int cmd_register_consumer(struct ltt_session *session, int domain,
goto error;
}
goto error;
}
- ret
=
LTTNG_OK;
+ ret
urn
LTTNG_OK;
error:
error:
+ if (socket) {
+ consumer_destroy_socket(socket);
+ }
return ret;
}
return ret;
}
This page took
0.023697 seconds
and
4
git commands to generate.