projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Possible dereference of null pointers
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
health-relayd.c
diff --git
a/src/bin/lttng-relayd/health-relayd.c
b/src/bin/lttng-relayd/health-relayd.c
index e3e48c9195a6bdd2a411c8e31aa1a2f198d19afe..be0b0b12400897b5f35a3633c653db3a2ca18add 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-151,7
+151,7
@@
static
int setup_health_path(void)
{
int is_root, ret = 0;
int setup_health_path(void)
{
int is_root, ret = 0;
- char *home_path = NULL, *rundir = NULL, *relayd_path;
+ char *home_path = NULL, *rundir = NULL, *relayd_path
= NULL
;
ret = parse_health_env();
if (ret) {
ret = parse_health_env();
if (ret) {
@@
-223,6
+223,7
@@
int setup_health_path(void)
end:
free(rundir);
end:
free(rundir);
+ free(relayd_path);
return ret;
}
return ret;
}
@@
-345,9
+346,14
@@
restart:
/* Event on the registration socket */
if (pollfd == sock) {
/* Event on the registration socket */
if (pollfd == sock) {
- if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+ if (revents & LPOLLIN) {
+ continue;
+ } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
ERR("Health socket poll error");
goto error;
ERR("Health socket poll error");
goto error;
+ } else {
+ ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+ goto error;
}
}
}
}
}
}
This page took
0.024918 seconds
and
4
git commands to generate.