Skip to content

Commit e645c60

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: exif: read from the correct pointer
2 parents fb739d1 + d4a9726 commit e645c60

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ PHP NEWS
1010
. Fix incorrect recurrence check of DatePeriod::createFromISO8601String().
1111
(ndossche)
1212

13+
- Exif:
14+
. Read correct value for single and double tags. (ndossche)
15+
1316
- GD:
1417
. Fixed bug GH-22121 (Double free in gdImageSetStyle() after
1518
overflow-triggered early return). (iliaal)

ext/exif/exif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,13 +2320,13 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c
23202320
#ifdef EXIF_DEBUG
23212321
php_error_docref(NULL, E_WARNING, "Found value of type single");
23222322
#endif
2323-
info_value->f = php_ifd_get_float(value);
2323+
info_value->f = php_ifd_get_float(vptr);
23242324
break;
23252325
case TAG_FMT_DOUBLE:
23262326
#ifdef EXIF_DEBUG
23272327
php_error_docref(NULL, E_WARNING, "Found value of type double");
23282328
#endif
2329-
info_value->d = php_ifd_get_double(value);
2329+
info_value->d = php_ifd_get_double(vptr);
23302330
break;
23312331
}
23322332
}

0 commit comments

Comments
 (0)