X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fmedia%2FJpegMetadataExtractor.php;h=dffb1f988b7caecd8e023aa998e4aeb6d03d60ff;hp=8a26f606f978c292ece3d2b4789cfac3b7920355;hb=9ce26a564d066a33ba7ae2a6502e3d57e7e4d48b;hpb=56d45558b102349f3480a46819669407aa3be2d6

diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index 8a26f606f9..dffb1f988b 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -122,14 +122,17 @@ class JpegMetadataExtractor {
 				$temp = self::jpegExtractMarker( $fh );
 				// check what type of app segment this is.
 				if ( substr( $temp, 0, 29 ) === "http://ns.adobe.com/xap/1.0/\x00" && $showXMP ) {
-					$segments["XMP"] = substr( $temp, 29 );
+					// use trim to remove trailing \0 chars
+					$segments["XMP"] = trim( substr( $temp, 29 ) );
 				} elseif ( substr( $temp, 0, 35 ) === "http://ns.adobe.com/xmp/extension/\x00" && $showXMP ) {
-					$segments["XMP_ext"][] = substr( $temp, 35 );
+					// use trim to remove trailing \0 chars
+					$segments["XMP_ext"][] = trim( substr( $temp, 35 ) );
 				} elseif ( substr( $temp, 0, 29 ) === "XMP\x00://ns.adobe.com/xap/1.0/\x00" && $showXMP ) {
 					// Some images (especially flickr images) seem to have this.
 					// I really have no idea what the deal is with them, but
 					// whatever...
-					$segments["XMP"] = substr( $temp, 29 );
+					// use trim to remove trailing \0 chars
+					$segments["XMP"] = trim( substr( $temp, 29 ) );
 					wfDebug( __METHOD__ . ' Found XMP section with wrong app identifier '
 						. "Using anyways.\n" );
 				} elseif ( substr( $temp, 0, 6 ) === "Exif\0\0" ) {