|
@@ -65,14 +65,15 @@ struct perf_header *perf_header__new(void)
|
|
|
{
|
|
|
struct perf_header *self = calloc(sizeof(*self), 1);
|
|
|
|
|
|
- if (!self)
|
|
|
- die("nomem");
|
|
|
-
|
|
|
- self->size = 1;
|
|
|
- self->attr = malloc(sizeof(void *));
|
|
|
+ if (self != NULL) {
|
|
|
+ self->size = 1;
|
|
|
+ self->attr = malloc(sizeof(void *));
|
|
|
|
|
|
- if (!self->attr)
|
|
|
- die("nomem");
|
|
|
+ if (self->attr == NULL) {
|
|
|
+ free(self);
|
|
|
+ self = NULL;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
return self;
|
|
|
}
|
|
@@ -426,6 +427,9 @@ struct perf_header *perf_header__read(int fd)
|
|
|
u64 f_id;
|
|
|
int nr_attrs, nr_ids, i, j;
|
|
|
|
|
|
+ if (self == NULL)
|
|
|
+ die("nomem");
|
|
|
+
|
|
|
if (perf_file_header__read(&f_header, self, fd) < 0)
|
|
|
die("incompatible file format");
|
|
|
|