diff options
author | Jayant Chowdhary <jchowdhary@google.com> | 2021-12-09 00:54:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-09 00:54:15 +0000 |
commit | 4e1312a4f72fa95937a98728362e88802092a78a (patch) | |
tree | 616030620baae08a1a15859a9d346d628b9d9077 | |
parent | 2c92a6dd3e5481f4c5d0eafcab9b25fa27304d54 (diff) | |
parent | 33832e661c1a9a9d2d3960dcab232bd8da8ea282 (diff) | |
download | libexif-4e1312a4f72fa95937a98728362e88802092a78a.tar.gz |
Ensure MakeNote data pointers are initialized with NULL. am: 4ceb535b53 am: 6360d28ab6 am: 33832e661c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libexif/+/15718932
Change-Id: I46fe892614b5c59c3e63e2b29198b48e58cde40a
-rw-r--r-- | libexif/canon/exif-mnote-data-canon.c | 2 | ||||
-rw-r--r-- | libexif/fuji/exif-mnote-data-fuji.c | 2 | ||||
-rw-r--r-- | libexif/olympus/exif-mnote-data-olympus.c | 2 | ||||
-rw-r--r-- | libexif/pentax/exif-mnote-data-pentax.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c index 4396c53..6d97930 100644 --- a/libexif/canon/exif-mnote-data-canon.c +++ b/libexif/canon/exif-mnote-data-canon.c @@ -236,6 +236,8 @@ exif_mnote_data_canon_load (ExifMnoteData *ne, tcount = 0; for (i = c, o = datao; i; --i, o += 12) { size_t s; + + memset(&n->entries[tcount], 0, sizeof(MnoteCanonEntry)); if (CHECKOVERFLOW(o,buf_size,12)) { exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteCanon", "Short MakerNote"); diff --git a/libexif/fuji/exif-mnote-data-fuji.c b/libexif/fuji/exif-mnote-data-fuji.c index 11ff8c3..3f3091b 100644 --- a/libexif/fuji/exif-mnote-data-fuji.c +++ b/libexif/fuji/exif-mnote-data-fuji.c @@ -196,6 +196,8 @@ exif_mnote_data_fuji_load (ExifMnoteData *en, tcount = 0; for (i = c, o = datao; i; --i, o += 12) { size_t s; + + memset(&n->entries[tcount], 0, sizeof(MnoteFujiEntry)); if (CHECKOVERFLOW(o, buf_size, 12)) { exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteDataFuji", "Short MakerNote"); diff --git a/libexif/olympus/exif-mnote-data-olympus.c b/libexif/olympus/exif-mnote-data-olympus.c index e7bf984..493463b 100644 --- a/libexif/olympus/exif-mnote-data-olympus.c +++ b/libexif/olympus/exif-mnote-data-olympus.c @@ -437,6 +437,8 @@ exif_mnote_data_olympus_load (ExifMnoteData *en, tcount = 0; for (i = c, o = o2; i; --i, o += 12) { size_t s; + + memset(&n->entries[tcount], 0, sizeof(MnoteOlympusEntry)); if (CHECKOVERFLOW(o, buf_size, 12)) { exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteOlympus", "Short MakerNote"); diff --git a/libexif/pentax/exif-mnote-data-pentax.c b/libexif/pentax/exif-mnote-data-pentax.c index f9eb69c..b4722d6 100644 --- a/libexif/pentax/exif-mnote-data-pentax.c +++ b/libexif/pentax/exif-mnote-data-pentax.c @@ -279,6 +279,8 @@ exif_mnote_data_pentax_load (ExifMnoteData *en, tcount = 0; for (i = c, o = datao; i; --i, o += 12) { size_t s; + + memset(&n->entries[tcount], 0, sizeof(MnotePentaxEntry)); if (CHECKOVERFLOW(o,buf_size,12)) { exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteDataPentax", "Short MakerNote"); |