@@ -1142,15 +1142,15 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
11421142 size = localExtraData . ReadLong ( ) ;
11431143 compressedSize = localExtraData . ReadLong ( ) ;
11441144
1145- if ( localFlags . Includes ( GeneralBitFlags . Descriptor ) )
1145+ if ( localFlags . HasAny ( GeneralBitFlags . Descriptor ) )
11461146 {
11471147 // These may be valid if patched later
1148- if ( ( size != - 1 ) && ( size != entry . Size ) )
1148+ if ( ( size > 0 ) && ( size != entry . Size ) )
11491149 {
11501150 throw new ZipException ( "Size invalid for descriptor" ) ;
11511151 }
11521152
1153- if ( ( compressedSize != - 1 ) && ( compressedSize != entry . CompressedSize ) )
1153+ if ( ( compressedSize > 0 ) && ( compressedSize != entry . CompressedSize ) )
11541154 {
11551155 throw new ZipException ( "Compressed size invalid for descriptor" ) ;
11561156 }
@@ -1181,9 +1181,11 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
11811181 throw new ZipException ( $ "Version required to extract this entry not supported ({ extractVersion } )") ;
11821182 }
11831183
1184- const GeneralBitFlags notSupportedFlags = GeneralBitFlags . Patched | GeneralBitFlags . StrongEncryption |
1185- GeneralBitFlags . EnhancedCompress | GeneralBitFlags . HeaderMasked ;
1186- if ( localFlags . Includes ( notSupportedFlags ) )
1184+ const GeneralBitFlags notSupportedFlags = GeneralBitFlags . Patched
1185+ | GeneralBitFlags . StrongEncryption
1186+ | GeneralBitFlags . EnhancedCompress
1187+ | GeneralBitFlags . HeaderMasked ;
1188+ if ( localFlags . HasAny ( notSupportedFlags ) )
11871189 {
11881190 throw new ZipException ( $ "The library does not support the zip features required to extract this entry ({ localFlags & notSupportedFlags : F} )") ;
11891191 }
@@ -1215,21 +1217,21 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12151217 var localEncoding = _stringCodec . ZipInputEncoding ( localFlags ) ;
12161218
12171219 // Local entry flags dont have reserved bit set on.
1218- if ( localFlags . Includes ( GeneralBitFlags . ReservedPKware4 | GeneralBitFlags . ReservedPkware14 | GeneralBitFlags . ReservedPkware15 ) )
1220+ if ( localFlags . HasAny ( GeneralBitFlags . ReservedPKware4 | GeneralBitFlags . ReservedPkware14 | GeneralBitFlags . ReservedPkware15 ) )
12191221 {
12201222 throw new ZipException ( "Reserved bit flags cannot be set." ) ;
12211223 }
12221224
12231225 // Encryption requires extract version >= 20
1224- if ( localFlags . Includes ( GeneralBitFlags . Encrypted ) && extractVersion < 20 )
1226+ if ( localFlags . HasAny ( GeneralBitFlags . Encrypted ) && extractVersion < 20 )
12251227 {
12261228 throw new ZipException ( $ "Version required to extract this entry is too low for encryption ({ extractVersion } )") ;
12271229 }
12281230
12291231 // Strong encryption requires encryption flag to be set and extract version >= 50.
1230- if ( localFlags . Includes ( GeneralBitFlags . StrongEncryption ) )
1232+ if ( localFlags . HasAny ( GeneralBitFlags . StrongEncryption ) )
12311233 {
1232- if ( ! localFlags . Includes ( GeneralBitFlags . Encrypted ) )
1234+ if ( ! localFlags . HasAny ( GeneralBitFlags . Encrypted ) )
12331235 {
12341236 throw new ZipException ( "Strong encryption flag set but encryption flag is not set" ) ;
12351237 }
@@ -1241,13 +1243,13 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12411243 }
12421244
12431245 // Patched entries require extract version >= 27
1244- if ( localFlags . Includes ( GeneralBitFlags . Patched ) && extractVersion < 27 )
1246+ if ( localFlags . HasAny ( GeneralBitFlags . Patched ) && extractVersion < 27 )
12451247 {
12461248 throw new ZipException ( $ "Patched data requires higher version than ({ extractVersion } )") ;
12471249 }
12481250
12491251 // Central header flags match local entry flags.
1250- if ( ! localFlags . Equals ( ( GeneralBitFlags ) entry . Flags ) )
1252+ if ( ( int ) localFlags != entry . Flags )
12511253 {
12521254 throw new ZipException ( $ "Central header/local header flags mismatch ({ ( GeneralBitFlags ) entry . Flags : F} vs { localFlags : F} )") ;
12531255 }
@@ -1264,23 +1266,23 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
12641266 }
12651267
12661268 // Strong encryption and extract version match
1267- if ( localFlags . Includes ( GeneralBitFlags . StrongEncryption ) )
1269+ if ( localFlags . HasAny ( GeneralBitFlags . StrongEncryption ) )
12681270 {
12691271 if ( extractVersion < 62 )
12701272 {
12711273 throw new ZipException ( "Strong encryption flag set but version not high enough" ) ;
12721274 }
12731275 }
12741276
1275- if ( localFlags . Includes ( GeneralBitFlags . HeaderMasked ) )
1277+ if ( localFlags . HasAny ( GeneralBitFlags . HeaderMasked ) )
12761278 {
12771279 if ( fileTime != 0 || fileDate != 0 )
12781280 {
12791281 throw new ZipException ( "Header masked set but date/time values non-zero" ) ;
12801282 }
12811283 }
12821284
1283- if ( ! localFlags . Includes ( GeneralBitFlags . Descriptor ) )
1285+ if ( ! localFlags . HasAny ( GeneralBitFlags . Descriptor ) )
12841286 {
12851287 if ( crcValue != ( uint ) entry . Crc )
12861288 {
@@ -1350,7 +1352,7 @@ private long TestLocalHeader(ZipEntry entry, HeaderTest tests)
13501352
13511353 // Size can be verified only if it is known in the local header.
13521354 // it will always be known in the central header.
1353- if ( ! localFlags . Includes ( GeneralBitFlags . Descriptor ) ||
1355+ if ( ! localFlags . HasAny ( GeneralBitFlags . Descriptor ) ||
13541356 ( ( size > 0 || compressedSize > 0 ) && entry . Size > 0 ) )
13551357 {
13561358 if ( size != 0 && size != entry . Size )
@@ -2504,7 +2506,7 @@ private void CopyBytes(ZipUpdate update, Stream destination, Stream source,
25042506 /// <returns>The descriptor size, zero if there isn't one.</returns>
25052507 private static int GetDescriptorSize ( ZipUpdate update , bool includingSignature )
25062508 {
2507- if ( ! ( ( GeneralBitFlags ) update . Entry . Flags ) . HasFlag ( GeneralBitFlags . Descriptor ) )
2509+ if ( ! ( ( GeneralBitFlags ) update . Entry . Flags ) . HasAny ( GeneralBitFlags . Descriptor ) )
25082510 return 0 ;
25092511
25102512 var descriptorWithSignature = update . Entry . LocalHeaderRequiresZip64
0 commit comments