Add signature offset to most conflicting parsers

MacPaw · Apr 10, 2019 · 1f5a299 · 1f5a299
1 parent 343d964
commit 1f5a299
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/XADRARParser.m b/XADRARParser.m
@@ -834,6 +834,7 @@ +(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data
 	if(header)
 	{
 		[props setObject:[NSNumber numberWithLongLong:header-bytes] forKey:@"RAREmbedOffset"];
+        [props setObject:[NSNumber numberWithLongLong:header-bytes] forKey:@"FoundSignatureOffset"];
 		return YES;
 	}
 

diff --git a/XADZipSFXParsers.h b/XADZipSFXParsers.h
@@ -25,7 +25,7 @@
 }
 
 +(int)requiredHeaderSize;
-+(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name;
++(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props;
 -(NSString *)formatName;
 
 @end

diff --git a/XADZipSFXParsers.m b/XADZipSFXParsers.m
@@ -25,7 +25,7 @@ @implementation XADZipSFXParser
 
 +(int)requiredHeaderSize { return 0x10000; }
 
-+(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name;
++(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props;
 {
 	const uint8_t *bytes=[data bytes];
 	int length=[data length];
@@ -35,8 +35,12 @@ +(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name
 
 	for(int i=2;i<length-9;i++)
 	{
-		if(bytes[i]=='P'&&bytes[i+1]=='K'&&bytes[i+2]==3&&bytes[i+3]==4)
-		if(bytes[i+4]>=10&&bytes[i+4]<40&&!bytes[i+9]) return YES;
+        if(bytes[i]=='P'&&bytes[i+1]=='K'&&bytes[i+2]==3&&bytes[i+3]==4) {
+            if(bytes[i+4]>=10&&bytes[i+4]<40&&!bytes[i+9]) {
+                [props setObject:[NSNumber numberWithLongLong:i] forKey:@"FoundSignatureOffset"];
+                return YES;
+            }
+        }
     }
 
 	return NO;