X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FJpegMetadataExtractor.php;h=67c957adac13a75b448c54aed2779081456d24ea;hb=4cb9c1a24bde6e29c5e8f05c7cd1de54ffdd342a;hp=5069f18045eb6facee3f159d1260cc9b3233c392;hpb=6b1a173f07f1a04188735f4688ce6335da14c3b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index 5069f18045..67c957adac 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -52,11 +52,11 @@ class JpegMetadataExtractor {
 
 		$segmentCount = 0;
 
-		$segments = array(
-			'XMP_ext' => array(),
-			'COM' => array(),
-			'PSIR' => array(),
-		);
+		$segments = [
+			'XMP_ext' => [],
+			'COM' => [],
+			'PSIR' => [],
+		];
 
 		if ( !$filename ) {
 			throw new MWException( "No filename specified for " . __METHOD__ );
@@ -82,9 +82,10 @@ class JpegMetadataExtractor {
 				// this is just a sanity check
 				throw new MWException( 'Too many jpeg segments. Aborting' );
 			}
-			if ( $buffer !== "\xFF" ) {
-				throw new MWException( "Error reading jpeg file marker. " .
-					"Expected 0xFF but got " . bin2hex( $buffer ) );
+			while ( $buffer !== "\xFF" ) {
+				// In theory JPEG files are not allowed to contain anything between the sections,
+				// but in practice they sometimes do. It's customary to ignore the garbage data.
+				$buffer = fread( $fh, 1 );
 			}
 
 			$buffer = fread( $fh, 1 );
@@ -155,7 +156,7 @@ class JpegMetadataExtractor {
 			} else {
 				// segment we don't care about, so skip
 				$size = wfUnpack( "nint", fread( $fh, 2 ), 2 );
-				if ( $size['int'] <= 2 ) {
+				if ( $size['int'] < 2 ) {
 					throw new MWException( "invalid marker size in jpeg" );
 				}
 				fseek( $fh, $size['int'] - 2, SEEK_CUR );
@@ -173,9 +174,13 @@ class JpegMetadataExtractor {
 	 */
 	private static function jpegExtractMarker( &$fh ) {
 		$size = wfUnpack( "nint", fread( $fh, 2 ), 2 );
-		if ( $size['int'] <= 2 ) {
+		if ( $size['int'] < 2 ) {
 			throw new MWException( "invalid marker size in jpeg" );
 		}
+		if ( $size['int'] === 2 ) {
+			// fread( ..., 0 ) generates a warning
+			return '';
+		}
 		$segment = fread( $fh, $size['int'] - 2 );
 		if ( strlen( $segment ) !== $size['int'] - 2 ) {
 			throw new MWException( "Segment shorter than expected" );