projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Memory leak on error in alloc_argv_from_user_opts()
[lttng-tools.git]
/
src
/
bin
/
lttng
/
conf.c
diff --git
a/src/bin/lttng/conf.c
b/src/bin/lttng/conf.c
index 5a0da9d338feb6e3322965602f55386a87f301c2..3a40ec5208edad530ae923c2d72b791c9f0ee276 100644
(file)
--- a/
src/bin/lttng/conf.c
+++ b/
src/bin/lttng/conf.c
@@
-16,6
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@
-24,7
+25,7
@@
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
-#include <common/
error
.h>
+#include <common/
common
.h>
#include <common/utils.h>
#include "conf.h"
#include <common/utils.h>
#include "conf.h"
@@
-186,8
+187,11
@@
char *config_read_session_name(char *path)
int ret;
FILE *fp;
char var[NAME_MAX], *session_name;
int ret;
FILE *fp;
char var[NAME_MAX], *session_name;
+#if (NAME_MAX == 255)
+#define NAME_MAX_SCANF_IS_A_BROKEN_API "254"
+#endif
- session_name = malloc(NAME_MAX);
+ session_name =
z
malloc(NAME_MAX);
if (session_name == NULL) {
ERR("Out of memory");
goto error;
if (session_name == NULL) {
ERR("Out of memory");
goto error;
@@
-202,7
+206,9
@@
char *config_read_session_name(char *path)
}
while (!feof(fp)) {
}
while (!feof(fp)) {
- if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
+ if ((ret = fscanf(fp, "%" NAME_MAX_SCANF_IS_A_BROKEN_API
+ "[^'=']=%" NAME_MAX_SCANF_IS_A_BROKEN_API "s\n",
+ var, session_name)) != 2) {
if (ret == -1) {
ERR("Missing session=NAME in config file.");
goto error_close;
if (ret == -1) {
ERR("Missing session=NAME in config file.");
goto error_close;
This page took
0.02399 seconds
and
4
git commands to generate.