projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: memcpy used on potentially overlapping regions
[lttng-tools.git]
/
src
/
common
/
utils.c
diff --git
a/src/common/utils.c
b/src/common/utils.c
index 17a313ee16f66efe8c574ddfddc8f94f156b9e11..5420490a76a40f1d66d504f46e545aaebba56f78 100644
(file)
--- a/
src/common/utils.c
+++ b/
src/common/utils.c
@@
-300,7
+300,7
@@
int expand_double_slashes_dot_and_dotdot(char *path)
* Copy the current token which is neither a '.' nor a '..'.
*/
path[expanded_path_len++] = '/';
* Copy the current token which is neither a '.' nor a '..'.
*/
path[expanded_path_len++] = '/';
- mem
cpy
(&path[expanded_path_len], curr_char, curr_token_len);
+ mem
move
(&path[expanded_path_len], curr_char, curr_token_len);
expanded_path_len += curr_token_len;
}
expanded_path_len += curr_token_len;
}
@@
-547,6
+547,7
@@
void utils_close_pipe(int *src)
if (ret) {
PERROR("close pipe");
}
if (ret) {
PERROR("close pipe");
}
+ src[i] = -1;
}
}
}
}
@@
-742,7
+743,8
@@
int utils_stream_file_path(const char *path_name, const char *file_name,
char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
const char *path_separator;
char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
const char *path_separator;
- if (path_name && path_name[strlen(path_name) - 1] == '/') {
+ if (path_name && (path_name[0] == '\0' ||
+ path_name[strlen(path_name) - 1] == '/')) {
path_separator = "";
} else {
path_separator = "/";
path_separator = "";
} else {
path_separator = "/";
This page took
0.02414 seconds
and
4
git commands to generate.