projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: trace-chunk: dereference after null check of old_path
[lttng-tools.git]
/
src
/
common
/
trace-chunk.c
diff --git
a/src/common/trace-chunk.c
b/src/common/trace-chunk.c
index 63bfb6c523add6a4058d3867a39581274cb55374..f909a682f6b376769b9cdbd27662e7d36f5e64b7 100644
(file)
--- a/
src/common/trace-chunk.c
+++ b/
src/common/trace-chunk.c
@@
-766,7
+766,7
@@
enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
goto skip_move;
}
goto skip_move;
}
- if (old_path[0] != '\0' && path[0] != '\0') {
+ if (old_path
&& old_path
[0] != '\0' && path[0] != '\0') {
/* Rename chunk directory. */
ret = lttng_directory_handle_rename_as_user(
chunk->session_output_directory,
/* Rename chunk directory. */
ret = lttng_directory_handle_rename_as_user(
chunk->session_output_directory,
@@
-804,7
+804,7
@@
enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
*/
chunk->chunk_directory = rename_directory;
rename_directory = NULL;
*/
chunk->chunk_directory = rename_directory;
rename_directory = NULL;
- } else if (old_path[0] == '\0') {
+ } else if (old_path
&& old_path
[0] == '\0') {
size_t i, count = lttng_dynamic_pointer_array_get_count(
&chunk->top_level_directories);
size_t i, count = lttng_dynamic_pointer_array_get_count(
&chunk->top_level_directories);
@@
-911,15
+911,11
@@
enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
}
skip_move:
}
skip_move:
- if (path) {
- new_path = strdup(path);
- if (!new_path) {
- ERR("Failed to allocate new trace chunk path");
- status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
- goto end;
- }
- } else {
- new_path = NULL;
+ new_path = strdup(path);
+ if (!new_path) {
+ ERR("Failed to allocate new trace chunk path");
+ status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+ goto end;
}
free(chunk->path);
chunk->path = new_path;
}
free(chunk->path);
chunk->path = new_path;
This page took
0.024222 seconds
and
4
git commands to generate.