1 files changed, 12 insertions, 4 deletions

diff --git a/trace-input.c b/trace-input.c
index 815d250..1c79843 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -82,6 +82,8 @@ struct tracecmd_input {
         int                     ref;
         struct cpu_data         *cpu_data;
 
+        struct tracecmd_ftrace  finfo;
+
         /* file information */
         size_t                  header_files_start;
         size_t                  ftrace_files_start;
@@ -479,9 +481,6 @@ int tracecmd_read_headers(struct tracecmd_input *handle)
         if (ret < 0)
                 return -1;
 
-        /* register default ftrace functions first */
-        tracecmd_ftrace_overrides(handle);
-
         return 0;
 }
 
@@ -676,6 +675,11 @@ void free_record(struct record *record)
         __free_record(record);
 }
 
+void tracecmd_record_ref(struct record *record)
+{
+        record->ref_count++;
+}
+
 static void free_next(struct tracecmd_input *handle, int cpu)
 {
         struct record *record = handle->cpu_data[cpu].next;
@@ -1514,7 +1518,8 @@ read_again:
         if (index < 0)
                 die("negative index on cpu record %d", cpu);
 
-        if (index >= handle->cpu_data[cpu].page_size + pevent->header_page_data_offset) {
+        if (index + (pevent->old_format ? 0 : 4) >=
+            handle->cpu_data[cpu].page_size + pevent->header_page_data_offset) {
                 if (get_next_page(handle, cpu))
                         return NULL;
                 return tracecmd_peek_data(handle, cpu);
@@ -1978,6 +1983,9 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd)
         if (!handle->pevent)
                 goto failed_read;
 
+        /* register default ftrace functions first */
+        tracecmd_ftrace_overrides(handle, &handle->finfo);
+
         handle->plugin_list = tracecmd_load_plugins(handle->pevent);
 
         handle->pevent->file_bigendian = buf[0];