Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Fix libtraceevent string handling in heterogeneous arch environments. (Kapileshwar Singh)

  - Avoid infinite loop at buildid processing with no samples in 'perf record'. (Mark Rutland)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 8a4537ee9bc3..fc3f7c922f99 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1580,7 +1580,10 @@ static int __perf_session__process_events(struct perf_session *session,
         file_offset = page_offset;
         head = data_offset - page_offset;
 
-        if (data_size && (data_offset + data_size < file_size))
+        if (data_size == 0)
+                goto out;
+
+        if (data_offset + data_size < file_size)
                 file_size = data_offset + data_size;
 
         ui_progress__init(&prog, file_size, "Processing events...");