When searching for the entry, do not loop over the original list of
requests. Use a copy instead. If we loop over the original list and
no entry is found in the first element of the list, later the memory
used for this first element will leak.
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@xxxxxxxxx>
---
kernel-shark/src/libkshark-collection.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel-shark/src/libkshark-collection.c b/kernel-shark/src/libkshark-collection.c
index 02a014e..95fdbab 100644
--- a/kernel-shark/src/libkshark-collection.c
+++ b/kernel-shark/src/libkshark-collection.c
@@ -622,6 +622,7 @@ kshark_get_collection_entry_front(struct kshark_entry_request **req,
ssize_t *index)
{
const struct kshark_entry *entry = NULL;
+ struct kshark_entry_request *list;
int req_count;
/*
@@ -638,12 +639,10 @@ kshark_get_collection_entry_front(struct kshark_entry_request **req,
* Loop over the list of redefined requests and search until you find
* the first matching entry.
*/
- while (*req) {
- entry = kshark_get_entry_front(*req, data, index);
+ for (list = *req; list; list = list->next) {
+ entry = kshark_get_entry_front(list, data, index);
if (entry)
break;
-
- *req = (*req)->next;
}
return entry;
@@ -680,6 +679,7 @@ kshark_get_collection_entry_back(struct kshark_entry_request **req,
ssize_t *index)
{
const struct kshark_entry *entry = NULL;
+ struct kshark_entry_request *list;
int req_count;
/*
@@ -695,12 +695,10 @@ kshark_get_collection_entry_back(struct kshark_entry_request **req,
* Loop over the list of redefined requests and search until you find
* the first matching entry.
*/
- while (*req) {
- entry = kshark_get_entry_back(*req, data, index);
+ for (list = *req; list; list = list->next) {
+ entry = kshark_get_entry_back(list, data, index);
if (entry)
break;
-
- *req = (*req)->next;
}
return entry;
--
2.20.1
|