SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-07-10 10:56:57 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Make file version finding safer

Browse Source
This commit is contained in:
Matt Nadareski
2021-08-23 20:45:13 -07:00
parent 5e560661d4
commit 5aae9b01d4
4 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BurnOutSharp/ProtectionType/ProtectDisc.cs
View File

@@ -232,8 +232,8 @@ namespace BurnOutSharp.ProtectionType
{
if (files.Length > 0)
{
FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(files[0]);
if (fvinfo.FileVersion != "")
var fvinfo = Utilities.GetFileVersionInfo(files[0]);
if (!string.IsNullOrWhiteSpace(fvinfo?.FileVersion))
{
version = fvinfo.FileVersion.Replace(" ", "").Replace(",", ".");
//ProtectDisc 9 uses a ProtectDisc-Core dll version 8.0.x
@@ -249,8 +249,8 @@ namespace BurnOutSharp.ProtectionType
files = Directory.GetFiles(Path.GetTempPath(), "a*.tmp");
if (files.Length > 0)
{
FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(files[0]);
if (fvinfo.FileVersion != "")
var fvinfo = Utilities.GetFileVersionInfo(files[0]);
if (!string.IsNullOrWhiteSpace(fvinfo?.FileVersion))
{
version = fvinfo.FileVersion.Replace(" ", "").Replace(",", ".");
fvinfo = null;

7
BurnOutSharp/ProtectionType/SolidShield.cs
View File

@@ -123,11 +123,8 @@ namespace BurnOutSharp.ProtectionType
public static string GetFileVersion(string file, byte[] fileContent, List<int> positions)
{
string companyName = string.Empty;
if (file != null)
companyName = FileVersionInfo.GetVersionInfo(file).CompanyName.ToLower();
if (companyName.Contains("solidshield") || companyName.Contains("tages"))
string companyName = Utilities.GetFileVersionInfo(file)?.CompanyName.ToLowerInvariant();
if (!string.IsNullOrWhiteSpace(companyName) && (companyName.Contains("solidshield") || companyName.Contains("tages")))
return Utilities.GetFileVersion(file);
return null;

8
BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
View File

@@ -156,8 +156,8 @@ namespace BurnOutSharp.ProtectionType
{
if (files.Length > 0)
{
FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(files[0]);
if (fvinfo.FileVersion != "")
var fvinfo = Utilities.GetFileVersionInfo(files[0]);
if (!string.IsNullOrWhiteSpace(fvinfo?.FileVersion))
{
version = fvinfo.FileVersion.Replace(" ", "").Replace(",", ".");
//ProtectDisc 9 uses a ProtectDisc-Core dll version 8.0.x
@@ -173,8 +173,8 @@ namespace BurnOutSharp.ProtectionType
files = Directory.GetFiles(Path.GetTempPath(), "a*.tmp");
if (files.Length > 0)
{
FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(files[0]);
if (fvinfo.FileVersion != "")
var fvinfo = Utilities.GetFileVersionInfo(files[0]);
if (!string.IsNullOrWhiteSpace(fvinfo?.FileVersion))
{
version = fvinfo.FileVersion.Replace(" ", "").Replace(",", ".");
fvinfo = null;

27
BurnOutSharp/Utilities.cs
View File

@@ -243,6 +243,26 @@ namespace BurnOutSharp
#region Protection
/// <summary>
/// Get the file version info object related to a path, if possible
/// </summary>
/// <param name="file">File to get information for</param>
/// <returns>FileVersionInfo object on success, null on error</returns>
public static FileVersionInfo GetFileVersionInfo(string file)
{
if (file == null || !File.Exists(file))
return null;
try
{
return FileVersionInfo.GetVersionInfo(file);
}
catch
{
return null;
}
}
/// <summary>
/// Get the file version as reported by the filesystem
/// </summary>
@@ -250,12 +270,9 @@ namespace BurnOutSharp
/// <returns>Version string, null on error</returns>
public static string GetFileVersion(string file)
{
if (file == null || !File.Exists(file))
var fvinfo = GetFileVersionInfo (file);
if (fvinfo?.FileVersion == null)
return string.Empty;
FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(file);
if (fvinfo.FileVersion == null)
return "";
if (fvinfo.FileVersion != "")
return fvinfo.FileVersion.Replace(", ", ".");
else