com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/exif/exif.c

From: Date: Tue, 02 Apr 2019 09:19:13 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/exif/exif.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105475@lists.php.net to get a copy of this message
Commit: 45c0cda03078c8d02354cfc042098d482adb0cf4 Author: Remi Collet <remi@php.net> Tue, 2 Apr 2019 11:05:54 +0200 Committer: Christoph M. Becker <cmbecker69@gmx.de> Tue, 2 Apr 2019 11:19:13 +0200 Parents: 116ef4674714177e771575f009f3e177e983935f Branches: PHP-7.3.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45c0cda03078c8d02354cfc042098d482adb0cf4 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: fix paste issue (cherry picked from commit 002983e4636ee30f733b958449f28e362e513cfc) Changed paths: M ext/exif/exif.c Diff: diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 93b18aa..f6419b7 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2620,7 +2620,7 @@ static void exif_process_CME (image_info_type *image_info, char *value, size_t l if (length>3) { switch(value[2]) { case 0: - exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, length, value), length; + exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, length, value, length); break; case 1: exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value, length);

« previous php.cvs (#105475) next »