From 6384dd190f33aae6542bd987ca6f3d5782f077da Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 23 Feb 2019 15:36:37 +0100 Subject: [PATCH] Fixed a potential NPE in exif_mnote_data_pentax_save Found by Coverity. --- libexif/pentax/exif-mnote-data-pentax.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libexif/pentax/exif-mnote-data-pentax.c b/libexif/pentax/exif-mnote-data-pentax.c index 35e8647..0bcbc97 100644 --- a/libexif/pentax/exif-mnote-data-pentax.c +++ b/libexif/pentax/exif-mnote-data-pentax.c @@ -79,12 +79,13 @@ exif_mnote_data_pentax_save (ExifMnoteData *ne, { ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) ne; size_t i, - base = 0, /* internal MakerNote tag number offset */ - o2 = 4 + 2; /* offset to first tag entry, past header */ - size_t datao = n->offset; /* this MakerNote style uses offsets - based on main IFD, not makernote IFD */ + size_t datao; + base = 0, /* internal MakerNote tag number offset */ + o2 = 4 + 2; /* offset to first tag entry, past header */ if (!n || !buf || !buf_size) return; + datao = n->offset; /* this MakerNote style uses offsets + based on main IFD, not makernote IFD */ /* * Allocate enough memory for header, the number of entries, entries, -- 2.7.4