projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng conf.c: use zmalloc()
[lttng-tools.git]
/
src
/
bin
/
lttng
/
conf.c
diff --git
a/src/bin/lttng/conf.c
b/src/bin/lttng/conf.c
index 7d537d1f6d654ab5dce83fa65adf333ed14e4bf4..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,8
@@
#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 "conf.h"
@@
-40,6
+42,7
@@
char *config_get_file_path(char *path)
ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
if (ret < 0) {
ERR("Fail allocating config file path");
ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
if (ret < 0) {
ERR("Fail allocating config file path");
+ file_path = NULL;
}
return file_path;
}
return file_path;
@@
-65,9
+68,7
@@
static FILE *open_config(char *path, const char *mode)
}
error:
}
error:
- if (file_path) {
- free(file_path);
- }
+ free(file_path);
return fp;
}
return fp;
}
@@
-116,19
+117,13
@@
static int write_config(char *file_path, size_t size, char *data)
if (len != 1) {
ret = -1;
}
if (len != 1) {
ret = -1;
}
- fclose(fp);
+ if (fclose(fp)) {
+ PERROR("close write_config");
+ }
end:
return ret;
}
end:
return ret;
}
-/*
- * Returns the HOME directory path. Caller MUST NOT free(3) the return pointer.
- */
-char *config_get_default_path(void)
-{
- return getenv("HOME");
-}
-
/*
* Destroys directory config and file config.
*/
/*
* Destroys directory config and file config.
*/
@@
-160,7
+155,7
@@
end:
*/
void config_destroy_default(void)
{
*/
void config_destroy_default(void)
{
- char *path =
config_get_default_path
();
+ char *path =
utils_get_home_dir
();
if (path == NULL) {
return;
}
if (path == NULL) {
return;
}
@@
-192,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;
@@
-203,11
+201,14
@@
char *config_read_session_name(char *path)
if (fp == NULL) {
ERR("Can't find valid lttng config %s/.lttngrc", path);
MSG("Did you create a session? (lttng create <my_session>)");
if (fp == NULL) {
ERR("Can't find valid lttng config %s/.lttngrc", path);
MSG("Did you create a session? (lttng create <my_session>)");
+ free(session_name);
goto error;
}
while (!feof(fp)) {
goto error;
}
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;
@@
-221,13
+222,20
@@
char *config_read_session_name(char *path)
}
error_close:
}
error_close:
- fclose(fp);
+ free(session_name);
+ ret = fclose(fp);
+ if (ret < 0) {
+ PERROR("close config read session name");
+ }
error:
return NULL;
found:
error:
return NULL;
found:
- fclose(fp);
+ ret = fclose(fp);
+ if (ret < 0) {
+ PERROR("close config read session name found");
+ }
return session_name;
}
return session_name;
}
@@
-240,14
+248,16
@@
found:
int config_add_session_name(char *path, char *name)
{
int ret;
int config_add_session_name(char *path, char *name)
{
int ret;
- char session_name[NAME_MAX];
+ char *attr = "session=";
+ /* Max name len accepted plus attribute's len and the NULL byte. */
+ char session_name[NAME_MAX + strlen(attr) + 1];
/*
* With GNU C < 2.1, snprintf returns -1 if the target buffer is too small;
* With GNU C >= 2.1, snprintf returns the required size (excluding closing null)
*/
/*
* With GNU C < 2.1, snprintf returns -1 if the target buffer is too small;
* With GNU C >= 2.1, snprintf returns the required size (excluding closing null)
*/
- ret = snprintf(session_name,
NAME_MAX, "session=%s\n"
, name);
- if (
(ret < 0) || (ret >= NAME_MAX)
) {
+ ret = snprintf(session_name,
sizeof(session_name), "%s%s\n", attr
, name);
+ if (
ret < 0
) {
ret = -1;
goto error;
}
ret = -1;
goto error;
}
@@
-266,7
+276,7
@@
int config_init(char *session_name)
int ret;
char *path;
int ret;
char *path;
- path =
config_get_default_path
();
+ path =
utils_get_home_dir
();
if (path == NULL) {
ret = -1;
goto error;
if (path == NULL) {
ret = -1;
goto error;
This page took
0.02596 seconds
and
4
git commands to generate.