Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-27 15:44:00 +08:00
Code Issues Projects Releases Wiki Activity

ArchiveFormat refactored.

Browse Source 
(Extract): method is no longer virtual.
(CreateFile): added check for malicious and malformed filenames.
(ParametersRequestEventArgs): removed InputWidget property.
This commit is contained in:
morkt 2014-07-29 07:01:36 +04:00
parent 92aa3debab
commit 8bc92d0dea
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GameRes/GameRes.cs
View File

@ -140,7 +140,7 @@ namespace GameRes
/// <summary> /// <summary>
/// Extract file referenced by <paramref name="entry"/> into current directory. /// Extract file referenced by <paramref name="entry"/> into current directory.
/// </summary> /// </summary>
public virtual void Extract (ArcFile file, Entry entry) public void Extract (ArcFile file, Entry entry)
{ {
using (var reader = OpenEntry (file, entry)) using (var reader = OpenEntry (file, entry))
{ {
@ -161,20 +161,35 @@ namespace GameRes
/// <summary> /// <summary>
/// Create file corresponding to <paramref name="entry"/> in current directory and open it /// Create file corresponding to <paramref name="entry"/> in current directory and open it
/// for writing. /// for writing. Overwrites existing file, if any.
/// </summary> /// </summary>
public virtual Stream CreateFile (Entry entry) public virtual Stream CreateFile (Entry entry)
{ {
string dir = Path.GetDirectoryName (entry.Name); string filename = entry.Name;
if (!string.IsNullOrEmpty (dir)) string dir = Path.GetDirectoryName (filename);
if (!string.IsNullOrEmpty (dir)) // check for malformed filenames
{ {
Directory.CreateDirectory (dir); string root = Path.GetPathRoot (dir);
if (!string.IsNullOrEmpty (root))
{
dir = dir.Substring (root.Length); // strip root
}
string cwd = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar;
dir = Path.GetFullPath (dir);
filename = Path.GetFileName (filename);
// check whether filename would reside within current directory
if (dir.StartsWith (cwd, StringComparison.OrdinalIgnoreCase))
{
// path looks legit, create it
Directory.CreateDirectory (dir);
filename = Path.Combine (dir, filename);
}
} }
return File.Create (entry.Name); return File.Create (filename);
} }
/// <summary> /// <summary>
/// Create resource wihin stream <paramref name="file"/> containing entries from the /// Create resource within stream <paramref name="file"/> containing entries from the
/// supplied <paramref name="list"/> and applying necessary <paramref name="options"/>. /// supplied <paramref name="list"/> and applying necessary <paramref name="options"/>.
/// </summary> /// </summary>
public virtual void Create (Stream file, IEnumerable<Entry> list, ResourceOptions options = null, public virtual void Create (Stream file, IEnumerable<Entry> list, ResourceOptions options = null,
@ -190,7 +205,7 @@ namespace GameRes
public virtual ResourceOptions GetOptions (object widget) public virtual ResourceOptions GetOptions (object widget)
{ {
return null; return GetDefaultOptions();
} }
public virtual object GetCreationWidget () public virtual object GetCreationWidget ()
@ -221,11 +236,6 @@ namespace GameRes
/// </summary> /// </summary>
public string Notice { get; set; } public string Notice { get; set; }
/// <summary>
/// UIElement responsible for displaying request.
/// </summary>
public object InputWidget { get; set; }
/// <summary> /// <summary>
/// Return value from ShowDialog() /// Return value from ShowDialog()
/// </summary> /// </summary>