projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: trace IR, values: reset pointers to `NULL` on destruction
[babeltrace.git]
/
lib
/
trace-ir
/
trace.c
diff --git
a/lib/trace-ir/trace.c
b/lib/trace-ir/trace.c
index b57f2dcc1e311fb5464f3e183a8e4cdc07789497..f5c66cb8332d22087d6ac4f1a0e5ccbd77542bde 100644
(file)
--- a/
lib/trace-ir/trace.c
+++ b/
lib/trace-ir/trace.c
@@
-89,6
+89,7
@@
void destroy_trace(struct bt_object *obj)
}
g_array_free(trace->is_static_listeners, TRUE);
}
g_array_free(trace->is_static_listeners, TRUE);
+ trace->is_static_listeners = NULL;
}
bt_object_pool_finalize(&trace->packet_header_field_pool);
}
bt_object_pool_finalize(&trace->packet_header_field_pool);
@@
-96,28
+97,35
@@
void destroy_trace(struct bt_object *obj)
if (trace->environment) {
BT_LOGD_STR("Destroying environment attributes.");
bt_attributes_destroy(trace->environment);
if (trace->environment) {
BT_LOGD_STR("Destroying environment attributes.");
bt_attributes_destroy(trace->environment);
+ trace->environment = NULL;
}
if (trace->name.str) {
g_string_free(trace->name.str, TRUE);
}
if (trace->name.str) {
g_string_free(trace->name.str, TRUE);
+ trace->name.str = NULL;
+ trace->name.value = NULL;
}
if (trace->streams) {
BT_LOGD_STR("Destroying streams.");
g_ptr_array_free(trace->streams, TRUE);
}
if (trace->streams) {
BT_LOGD_STR("Destroying streams.");
g_ptr_array_free(trace->streams, TRUE);
+ trace->streams = NULL;
}
if (trace->stream_classes) {
BT_LOGD_STR("Destroying stream classes.");
g_ptr_array_free(trace->stream_classes, TRUE);
}
if (trace->stream_classes) {
BT_LOGD_STR("Destroying stream classes.");
g_ptr_array_free(trace->stream_classes, TRUE);
+ trace->stream_classes = NULL;
}
if (trace->stream_classes_stream_count) {
g_hash_table_destroy(trace->stream_classes_stream_count);
}
if (trace->stream_classes_stream_count) {
g_hash_table_destroy(trace->stream_classes_stream_count);
+ trace->stream_classes_stream_count = NULL;
}
BT_LOGD_STR("Putting packet header field classe.");
bt_object_put_ref(trace->packet_header_fc);
}
BT_LOGD_STR("Putting packet header field classe.");
bt_object_put_ref(trace->packet_header_fc);
+ trace->packet_header_fc = NULL;
g_free(trace);
}
g_free(trace);
}
This page took
0.023785 seconds
and
4
git commands to generate.